diff options
author | Jonas Karlman | 2024-04-08 18:14:11 +0000 |
---|---|---|
committer | Kever Yang | 2024-04-26 15:47:03 +0800 |
commit | c5b8eaff632e8c46f77ba1587568a698a5b6f039 (patch) | |
tree | c31853f76c57d58d173fa85e20b276c4d06a5baf | |
parent | 275550787220589b81a46e925c81a961505f6931 (diff) |
rockchip: rk3308: Move cru and grf include files to arch-rockchip
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@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
-rw-r--r-- | arch/arm/include/asm/arch-rockchip/cru_rk3308.h (renamed from arch/arm/include/asm/arch-rk3308/cru_rk3308.h) | 0 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-rockchip/grf_rk3308.h (renamed from arch/arm/include/asm/arch-rk3308/grf_rk3308.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-rockchip/rk3308/clk_rk3308.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-rockchip/rk3308/rk3308.c | 2 | ||||
-rw-r--r-- | board/firefly/firefly-rk3308/roc_cc_rk3308.c | 2 | ||||
-rw-r--r-- | drivers/clk/rockchip/clk_rk3308.c | 2 | ||||
-rw-r--r-- | drivers/net/gmac_rockchip.c | 2 | ||||
-rw-r--r-- | drivers/ram/rockchip/sdram_rk3308.c | 2 |
8 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/include/asm/arch-rk3308/cru_rk3308.h b/arch/arm/include/asm/arch-rockchip/cru_rk3308.h index 091ae82d7cc..091ae82d7cc 100644 --- a/arch/arm/include/asm/arch-rk3308/cru_rk3308.h +++ b/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 index a995bb950d9..a995bb950d9 100644 --- a/arch/arm/include/asm/arch-rk3308/grf_rk3308.h +++ b/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 ccda53380c6..201bf661f9b 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 b3ffabc5449..a0915c72bfa 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 99a52a77116..af00250e118 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 c46b58e3162..861648321d4 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 33fc36da507..51f835adabc 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 10828e80822..264366291cf 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 { |