[PATCH 15/18] rockchip: migrate hardware.h inclusion into appropriate files

[Kever Yang]

Hi Quentin,

On 2024/1/23 22:49, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz at theobroma-systems.com>
>
> Nothing of the hardware.h is used in include/configs, therefore, let's
> move that include to the files that actually require this include.

hardware.h is one of common header for soc level, it's reasonable in the 
soc_common.h.

Thanks,

- Kever

>
> Cc: Quentin Schulz <foss+uboot at 0leil.net>
> Signed-off-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>
> ---
>   arch/arm/mach-rockchip/rk3066/rk3066.c | 1 +
>   drivers/ram/rockchip/dmc-rk3368.c      | 1 +
>   drivers/ram/rockchip/sdram_rk3188.c    | 1 +
>   drivers/ram/rockchip/sdram_rk3288.c    | 1 +
>   include/configs/rk3036_common.h        | 1 -
>   include/configs/rk3066_common.h        | 1 -
>   include/configs/rk3188_common.h        | 1 -
>   include/configs/rk322x_common.h        | 1 -
>   include/configs/rk3288_common.h        | 1 -
>   include/configs/rk3368_common.h        | 1 -
>   include/configs/rv1108_common.h        | 1 -
>   11 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm/mach-rockchip/rk3066/rk3066.c b/arch/arm/mach-rockchip/rk3066/rk3066.c
> index 78c7d894f90..6661b788295 100644
> --- a/arch/arm/mach-rockchip/rk3066/rk3066.c
> +++ b/arch/arm/mach-rockchip/rk3066/rk3066.c
> @@ -7,6 +7,7 @@
>   #include <asm/io.h>
>   #include <asm/arch-rockchip/bootrom.h>
>   #include <asm/arch-rockchip/grf_rk3066.h>
> +#include <asm/arch-rockchip/hardware.h>
>   
>   #define GRF_BASE	0x20008000
>   
> diff --git a/drivers/ram/rockchip/dmc-rk3368.c b/drivers/ram/rockchip/dmc-rk3368.c
> index f36be941a38..74d8aed571c 100644
> --- a/drivers/ram/rockchip/dmc-rk3368.c
> +++ b/drivers/ram/rockchip/dmc-rk3368.c
> @@ -20,6 +20,7 @@
>   #include <asm/arch-rockchip/ddr_rk3368.h>
>   #include <asm/arch-rockchip/sdram.h>
>   #include <asm/arch-rockchip/sdram_rk3288.h>
> +#include <asm/arch-rockchip/hardware.h>
>   #include <linux/bitops.h>
>   #include <linux/delay.h>
>   #include <linux/err.h>
> diff --git a/drivers/ram/rockchip/sdram_rk3188.c b/drivers/ram/rockchip/sdram_rk3188.c
> index ad9f936df55..16a68885f1f 100644
> --- a/drivers/ram/rockchip/sdram_rk3188.c
> +++ b/drivers/ram/rockchip/sdram_rk3188.c
> @@ -25,6 +25,7 @@
>   #include <asm/arch-rockchip/pmu_rk3188.h>
>   #include <asm/arch-rockchip/sdram.h>
>   #include <asm/arch-rockchip/sdram_rk3288.h>
> +#include <asm/arch-rockchip/hardware.h>
>   #include <linux/delay.h>
>   #include <linux/err.h>
>   
> diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
> index c99118fd612..ec6bdcb2015 100644
> --- a/drivers/ram/rockchip/sdram_rk3288.c
> +++ b/drivers/ram/rockchip/sdram_rk3288.c
> @@ -25,6 +25,7 @@
>   #include <asm/arch-rockchip/pmu_rk3288.h>
>   #include <asm/arch-rockchip/sdram.h>
>   #include <asm/arch-rockchip/sdram_rk3288.h>
> +#include <asm/arch-rockchip/hardware.h>
>   #include <linux/delay.h>
>   #include <linux/err.h>
>   #include <power/regulator.h>
> diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
> index c2abd14e114..0bf9e8b9a2e 100644
> --- a/include/configs/rk3036_common.h
> +++ b/include/configs/rk3036_common.h
> @@ -5,7 +5,6 @@
>   #ifndef __CONFIG_RK3036_COMMON_H
>   #define __CONFIG_RK3036_COMMON_H
>   
> -#include <asm/arch-rockchip/hardware.h>
>   #include "rockchip-common.h"
>   
>   #define CFG_SYS_HZ_CLOCK		24000000
> diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h
> index d70c8f77d48..6a3b6900463 100644
> --- a/include/configs/rk3066_common.h
> +++ b/include/configs/rk3066_common.h
> @@ -6,7 +6,6 @@
>   #ifndef __CONFIG_RK3066_COMMON_H
>   #define __CONFIG_RK3066_COMMON_H
>   
> -#include <asm/arch-rockchip/hardware.h>
>   #include "rockchip-common.h"
>   
>   #define CFG_IRAM_BASE		0x10080000
> diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
> index a8cee1e44d4..98f2c25f3cf 100644
> --- a/include/configs/rk3188_common.h
> +++ b/include/configs/rk3188_common.h
> @@ -6,7 +6,6 @@
>   #ifndef __CONFIG_RK3188_COMMON_H
>   #define __CONFIG_RK3188_COMMON_H
>   
> -#include <asm/arch-rockchip/hardware.h>
>   #include "rockchip-common.h"
>   
>   #define CFG_IRAM_BASE	0x10080000
> diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
> index 15f77df3e17..bab4ca015f7 100644
> --- a/include/configs/rk322x_common.h
> +++ b/include/configs/rk322x_common.h
> @@ -5,7 +5,6 @@
>   #ifndef __CONFIG_RK322X_COMMON_H
>   #define __CONFIG_RK322X_COMMON_H
>   
> -#include <asm/arch-rockchip/hardware.h>
>   #include "rockchip-common.h"
>   
>   #define CFG_SYS_HZ_CLOCK		24000000
> diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
> index 3063076a97a..0c449e31099 100644
> --- a/include/configs/rk3288_common.h
> +++ b/include/configs/rk3288_common.h
> @@ -6,7 +6,6 @@
>   #ifndef __CONFIG_RK3288_COMMON_H
>   #define __CONFIG_RK3288_COMMON_H
>   
> -#include <asm/arch-rockchip/hardware.h>
>   #include "rockchip-common.h"
>   
>   #define CFG_SYS_HZ_CLOCK		24000000
> diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
> index ccb5369b901..d488f8d477a 100644
> --- a/include/configs/rk3368_common.h
> +++ b/include/configs/rk3368_common.h
> @@ -8,7 +8,6 @@
>   
>   #include "rockchip-common.h"
>   
> -#include <asm/arch-rockchip/hardware.h>
>   #include <linux/sizes.h>
>   
>   #define CFG_SYS_SDRAM_BASE		0
> diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h
> index 3bf70a0e0ae..ff28236a21d 100644
> --- a/include/configs/rv1108_common.h
> +++ b/include/configs/rv1108_common.h
> @@ -5,7 +5,6 @@
>   #ifndef __CONFIG_RV1108_COMMON_H
>   #define __CONFIG_RV1108_COMMON_H
>   
> -#include <asm/arch-rockchip/hardware.h>
>   #include "rockchip-common.h"
>   
>   #define CFG_IRAM_BASE		0x10080000
>