[PATCH v2 14/14] rockchip: rk3308: Move cru and grf include files to arch-rockchip

[Kever Yang]

On 2024/4/9 02:14, Jonas Karlman wrote:
> Move cru_rk3308.h and grf_rk3308.h to arch-rockchip to match path used
> for all other Rockchip SoCs.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
> v2: New patch
> ---
>   .../arm/include/asm/{arch-rk3308 => arch-rockchip}/cru_rk3308.h | 0
>   .../arm/include/asm/{arch-rk3308 => arch-rockchip}/grf_rk3308.h | 0
>   arch/arm/mach-rockchip/rk3308/clk_rk3308.c                      | 2 +-
>   arch/arm/mach-rockchip/rk3308/rk3308.c                          | 2 +-
>   board/firefly/firefly-rk3308/roc_cc_rk3308.c                    | 2 +-
>   drivers/clk/rockchip/clk_rk3308.c                               | 2 +-
>   drivers/net/gmac_rockchip.c                                     | 2 +-
>   drivers/ram/rockchip/sdram_rk3308.c                             | 2 +-
>   8 files changed, 6 insertions(+), 6 deletions(-)
>   rename arch/arm/include/asm/{arch-rk3308 => arch-rockchip}/cru_rk3308.h (100%)
>   rename arch/arm/include/asm/{arch-rk3308 => arch-rockchip}/grf_rk3308.h (100%)
>
> diff --git a/arch/arm/include/asm/arch-rk3308/cru_rk3308.h b/arch/arm/include/asm/arch-rockchip/cru_rk3308.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-rk3308/cru_rk3308.h
> rename to arch/arm/include/asm/arch-rockchip/cru_rk3308.h
> diff --git a/arch/arm/include/asm/arch-rk3308/grf_rk3308.h b/arch/arm/include/asm/arch-rockchip/grf_rk3308.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-rk3308/grf_rk3308.h
> rename to arch/arm/include/asm/arch-rockchip/grf_rk3308.h
> diff --git a/arch/arm/mach-rockchip/rk3308/clk_rk3308.c b/arch/arm/mach-rockchip/rk3308/clk_rk3308.c
> index ccda53380c6f..201bf661f9bb 100644
> --- a/arch/arm/mach-rockchip/rk3308/clk_rk3308.c
> +++ b/arch/arm/mach-rockchip/rk3308/clk_rk3308.c
> @@ -7,7 +7,7 @@
>   #include <dm.h>
>   #include <syscon.h>
>   #include <asm/arch-rockchip/clock.h>
> -#include <asm/arch/cru_rk3308.h>
> +#include <asm/arch-rockchip/cru_rk3308.h>
>   #include <linux/err.h>
>   
>   int rockchip_get_clk(struct udevice **devp)
> diff --git a/arch/arm/mach-rockchip/rk3308/rk3308.c b/arch/arm/mach-rockchip/rk3308/rk3308.c
> index b3ffabc5449a..a0915c72bfa0 100644
> --- a/arch/arm/mach-rockchip/rk3308/rk3308.c
> +++ b/arch/arm/mach-rockchip/rk3308/rk3308.c
> @@ -5,8 +5,8 @@
>   #include <common.h>
>   #include <init.h>
>   #include <malloc.h>
> -#include <asm/arch/grf_rk3308.h>
>   #include <asm/arch-rockchip/bootrom.h>
> +#include <asm/arch-rockchip/grf_rk3308.h>
>   #include <asm/arch-rockchip/hardware.h>
>   #include <asm/gpio.h>
>   #include <debug_uart.h>
> diff --git a/board/firefly/firefly-rk3308/roc_cc_rk3308.c b/board/firefly/firefly-rk3308/roc_cc_rk3308.c
> index 99a52a77116a..af00250e118d 100644
> --- a/board/firefly/firefly-rk3308/roc_cc_rk3308.c
> +++ b/board/firefly/firefly-rk3308/roc_cc_rk3308.c
> @@ -5,7 +5,7 @@
>   
>   #include <common.h>
>   #include <adc.h>
> -#include <asm/arch/grf_rk3308.h>
> +#include <asm/arch-rockchip/grf_rk3308.h>
>   #include <asm/arch-rockchip/hardware.h>
>   #include <linux/bitops.h>
>   
> diff --git a/drivers/clk/rockchip/clk_rk3308.c b/drivers/clk/rockchip/clk_rk3308.c
> index c46b58e31626..861648321d40 100644
> --- a/drivers/clk/rockchip/clk_rk3308.c
> +++ b/drivers/clk/rockchip/clk_rk3308.c
> @@ -12,8 +12,8 @@
>   #include <malloc.h>
>   #include <syscon.h>
>   #include <asm/global_data.h>
> -#include <asm/arch/cru_rk3308.h>
>   #include <asm/arch-rockchip/clock.h>
> +#include <asm/arch-rockchip/cru_rk3308.h>
>   #include <asm/arch-rockchip/hardware.h>
>   #include <dm/device-internal.h>
>   #include <dm/lists.h>
> diff --git a/drivers/net/gmac_rockchip.c b/drivers/net/gmac_rockchip.c
> index 33fc36da5077..51f835adabc3 100644
> --- a/drivers/net/gmac_rockchip.c
> +++ b/drivers/net/gmac_rockchip.c
> @@ -19,7 +19,7 @@
>   #include <asm/arch-rockchip/grf_px30.h>
>   #include <asm/arch-rockchip/grf_rk322x.h>
>   #include <asm/arch-rockchip/grf_rk3288.h>
> -#include <asm/arch-rk3308/grf_rk3308.h>
> +#include <asm/arch-rockchip/grf_rk3308.h>
>   #include <asm/arch-rockchip/grf_rk3328.h>
>   #include <asm/arch-rockchip/grf_rk3368.h>
>   #include <asm/arch-rockchip/grf_rk3399.h>
> diff --git a/drivers/ram/rockchip/sdram_rk3308.c b/drivers/ram/rockchip/sdram_rk3308.c
> index 10828e80822a..264366291cf8 100644
> --- a/drivers/ram/rockchip/sdram_rk3308.c
> +++ b/drivers/ram/rockchip/sdram_rk3308.c
> @@ -7,8 +7,8 @@
>   #include <dm.h>
>   #include <ram.h>
>   #include <syscon.h>
> -#include <asm/arch/grf_rk3308.h>
>   #include <asm/arch-rockchip/clock.h>
> +#include <asm/arch-rockchip/grf_rk3308.h>
>   #include <asm/arch-rockchip/sdram.h>
>   
>   struct dram_info {