rockchip: correct SYS_SOC name for all rockchip SoCs
Subsystems (13)
cover rockchip: correct SYS_SOC name for all rockchip SoCs
Rockchip use 'arch-rockchip' instead of arch-$(SOC) as common header file path, so that we do not need to make folder for each soc, because many header file are shared for all the SoCs which not need separate for each SoC.
With the SoC name correct to its own name, the build system can include the $(SOC)-u-boot.dtsi automatically.
Kever Yang (3):
rockchip: arm: use 'arch-rockchip' for common header
rockchip: use 'arch-rockchip' as header file path
rockchip: correct ARCH_SOC name
arch/arm/cpu/armv8/start.S | 4 ++++ .../include/asm/arch-rockchip/ddr_rk3188.h | 2 +- arch/arm/include/asm/gpio.h | 2 +- arch/arm/lib/vectors.S | 5 ++++- arch/arm/mach-rockchip/Kconfig | 2 +- arch/arm/mach-rockchip/boot_mode.c | 2 +- arch/arm/mach-rockchip/bootrom.c | 4 ++-- arch/arm/mach-rockchip/rk3036-board-spl.c | 12 +++++------ arch/arm/mach-rockchip/rk3036-board.c | 10 +++++----- arch/arm/mach-rockchip/rk3036/Kconfig | 2 +- arch/arm/mach-rockchip/rk3036/clk_rk3036.c | 4 ++-- arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | 12 +++++------ arch/arm/mach-rockchip/rk3036/syscon_rk3036.c | 2 +- arch/arm/mach-rockchip/rk3128-board.c | 10 +++++----- arch/arm/mach-rockchip/rk3128/Kconfig | 2 +- arch/arm/mach-rockchip/rk3128/clk_rk3128.c | 4 ++-- arch/arm/mach-rockchip/rk3128/syscon_rk3128.c | 2 +- arch/arm/mach-rockchip/rk3188-board-spl.c | 16 +++++++-------- arch/arm/mach-rockchip/rk3188-board.c | 10 +++++----- arch/arm/mach-rockchip/rk3188/Kconfig | 2 +- arch/arm/mach-rockchip/rk3188/clk_rk3188.c | 4 ++-- arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 2 +- arch/arm/mach-rockchip/rk322x-board-spl.c | 12 +++++------ arch/arm/mach-rockchip/rk322x-board.c | 10 +++++----- arch/arm/mach-rockchip/rk322x/Kconfig | 2 +- arch/arm/mach-rockchip/rk322x/clk_rk322x.c | 4 ++-- arch/arm/mach-rockchip/rk322x/syscon_rk322x.c | 2 +- arch/arm/mach-rockchip/rk3288-board-spl.c | 20 +++++++++---------- arch/arm/mach-rockchip/rk3288-board-tpl.c | 14 ++++++------- arch/arm/mach-rockchip/rk3288-board.c | 12 +++++------ arch/arm/mach-rockchip/rk3288/Kconfig | 2 +- arch/arm/mach-rockchip/rk3288/clk_rk3288.c | 4 ++-- arch/arm/mach-rockchip/rk3288/rk3288.c | 2 +- arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 2 +- arch/arm/mach-rockchip/rk3328/Kconfig | 2 +- arch/arm/mach-rockchip/rk3328/clk_rk3328.c | 4 ++-- arch/arm/mach-rockchip/rk3328/rk3328.c | 2 +- arch/arm/mach-rockchip/rk3328/syscon_rk3328.c | 2 +- arch/arm/mach-rockchip/rk3368-board-spl.c | 10 +++++----- arch/arm/mach-rockchip/rk3368-board-tpl.c | 12 +++++------ arch/arm/mach-rockchip/rk3368/Kconfig | 2 +- arch/arm/mach-rockchip/rk3368/clk_rk3368.c | 4 ++-- arch/arm/mach-rockchip/rk3368/rk3368.c | 6 +++--- arch/arm/mach-rockchip/rk3368/syscon_rk3368.c | 2 +- arch/arm/mach-rockchip/rk3399-board-spl.c | 12 +++++------ arch/arm/mach-rockchip/rk3399-board.c | 2 +- arch/arm/mach-rockchip/rk3399/Kconfig | 2 +- arch/arm/mach-rockchip/rk3399/clk_rk3399.c | 4 ++-- arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +- arch/arm/mach-rockchip/rk3399/syscon_rk3399.c | 2 +- arch/arm/mach-rockchip/rk_timer.c | 2 +- arch/arm/mach-rockchip/rv1108/Kconfig | 2 +- arch/arm/mach-rockchip/rv1108/clk_rv1108.c | 4 ++-- arch/arm/mach-rockchip/rv1108/syscon_rv1108.c | 2 +- arch/arm/mach-rockchip/sdram_common.c | 2 +- board/elgin/elgin_rv1108/elgin_rv1108.c | 4 ++-- board/rockchip/evb_rk3036/evb_rk3036.c | 4 ++-- board/rockchip/evb_rk3229/evb_rk3229.c | 2 +- board/rockchip/evb_rk3399/evb-rk3399.c | 2 +- board/rockchip/evb_rv1108/evb_rv1108.c | 4 ++-- board/rockchip/kylin_rk3036/kylin_rk3036.c | 4 ++-- board/rockchip/sheep_rk3368/sheep_rk3368.c | 4 ++-- .../lion_rk3368/lion_rk3368.c | 6 +++--- .../puma_rk3399/puma-rk3399.c | 10 +++++----- board/vamrs/rock960_rk3399/rock960-rk3399.c | 2 +- cmd/rockusb.c | 2 +- drivers/clk/rockchip/clk_rk3036.c | 6 +++--- drivers/clk/rockchip/clk_rk3128.c | 6 +++--- drivers/clk/rockchip/clk_rk3188.c | 8 ++++---- drivers/clk/rockchip/clk_rk322x.c | 6 +++--- drivers/clk/rockchip/clk_rk3288.c | 8 ++++---- drivers/clk/rockchip/clk_rk3328.c | 8 ++++---- drivers/clk/rockchip/clk_rk3368.c | 6 +++--- drivers/clk/rockchip/clk_rk3399.c | 6 +++--- drivers/clk/rockchip/clk_rv1108.c | 6 +++--- drivers/gpio/rk_gpio.c | 3 ++- drivers/i2c/rk_i2c.c | 6 +++--- drivers/mmc/rockchip_dw_mmc.c | 4 ++-- drivers/net/gmac_rockchip.c | 18 ++++++++--------- drivers/pwm/rk_pwm.c | 2 +- drivers/ram/rockchip/dmc-rk3368.c | 12 +++++------ drivers/ram/rockchip/sdram_rk3128.c | 6 +++--- drivers/ram/rockchip/sdram_rk3188.c | 14 ++++++------- drivers/ram/rockchip/sdram_rk322x.c | 16 +++++++-------- drivers/ram/rockchip/sdram_rk3288.c | 14 ++++++------- drivers/ram/rockchip/sdram_rk3328.c | 6 +++--- drivers/ram/rockchip/sdram_rk3399.c | 12 +++++------ drivers/reset/reset-rockchip.c | 2 +- drivers/serial/serial_rockchip.c | 2 +- drivers/sound/rockchip_sound.c | 2 +- drivers/spi/rk_spi.c | 4 ++-- drivers/sysreset/sysreset_rockchip.c | 6 +++--- drivers/timer/rockchip_timer.c | 2 +- drivers/usb/gadget/f_rockusb.c | 2 +- drivers/video/rockchip/rk3288_hdmi.c | 6 +++--- drivers/video/rockchip/rk3288_mipi.c | 10 +++++----- drivers/video/rockchip/rk3288_vop.c | 6 +++--- drivers/video/rockchip/rk3399_hdmi.c | 6 +++--- drivers/video/rockchip/rk3399_mipi.c | 10 +++++----- drivers/video/rockchip/rk3399_vop.c | 2 +- drivers/video/rockchip/rk_edp.c | 6 +++--- drivers/video/rockchip/rk_hdmi.c | 5 ++--- drivers/video/rockchip/rk_lvds.c | 6 +++--- drivers/video/rockchip/rk_mipi.c | 9 ++++----- drivers/video/rockchip/rk_vop.c | 7 +++---- drivers/video/rockchip/rk_vop.h | 2 +- include/configs/rk3036_common.h | 2 +- include/configs/rk3188_common.h | 2 +- include/configs/rk322x_common.h | 2 +- include/configs/rk3288_common.h | 2 +- include/configs/rk3368_common.h | 2 +- include/configs/rv1108_common.h | 2 +- 112 files changed, 306 insertions(+), 301 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/3 rockchip: arm: use 'arch-rockchip' for common header
rockchip platform header file is in 'arch-rockchip' instead of arch-$(SOC) for all SoCs.
---
arch/arm/cpu/armv8/start.S | 4 ++++ arch/arm/include/asm/gpio.h | 2 +- arch/arm/lib/vectors.S | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-)
arch/arm/cpu/armv8/start.S +4 -0
@@ -26,7 +26,11 @@ _start: * order to boot, allow them to set that in their boot0.h file and then * use it here. */ +#ifdef CONFIG_ARCH_ROCKCHIP +#include <asm/arch-rockchip/boot0.h> +#else #include <asm/arch/boot0.h> +#endif #else b reset #endif
arch/arm/include/asm/gpio.h +1 -1
@@ -1,5 +1,5 @@#if !defined(CONFIG_ARCH_UNIPHIER ) && !defined(CONFIG_ARCH_STI ) && \ - !defined(CONFIG_ARCH_K3 ) + !defined(CONFIG_ARCH_K3 ) && !defined(CONFIG_ARCH_ROCKCHIP )#include <asm/arch/gpio.h> #endif #include <asm-generic/gpio.h>
arch/arm/lib/vectors.S +4 -1
@@ -67,8 +67,11 @@ * (1) defines '_start:' as appropriate * (2) inserts the vector table using ARM_VECTORS as appropriate */ +#ifdef CONFIG_ARCH_ROCKCHIP +#include <asm/arch-rockchip/boot0.h> +#else #include <asm/arch/boot0.h> - +#endif #else /*
Signature · 1 line
2.20.1
PATCH 1/3 rockchip: arm: use 'arch-rockchip' for common header
Quoted 7 lines · Kever Yang
rockchip platform header file is in 'arch-rockchip' instead of arch-$(SOC) for all SoCs.
Signed-off-by Kever Yang <[email protected]>
PATCH 1/3 rockchip: arm: use 'arch-rockchip' for common header
In reply to Kever YangQuoted 46 lines · Kever Yang
rockchip platform header file is in 'arch-rockchip' instead of arch-$(SOC) for all SoCs.
Signed-off-by Kever Yang <[email protected]>---
arch/arm/cpu/armv8/start.S | 4 ++++ arch/arm/include/asm/gpio.h | 2 +- arch/arm/lib/vectors.S | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-)arch/arm/cpu/armv8/start.S +4
-0@@ -26,7 +26,11 @@ _start: * order to boot, allow them to set that in their boot0.h file and then * use it here. */ +#ifdef CONFIG_ARCH_ROCKCHIP +#include <asm/arch-rockchip/boot0.h> +#else #include <asm/arch/boot0.h> +#endif #else b reset #endifarch/arm/include/asm/gpio.h +1
-1@@ -1,5 +1,5 @@#if !defined(CONFIG_ARCH_UNIPHIER ) && !defined(CONFIG_ARCH_STI ) && \ - !defined(CONFIG_ARCH_K3 ) + !defined(CONFIG_ARCH_K3 ) && !defined(CONFIG_ARCH_ROCKCHIP )#include <asm/arch/gpio.h> #endif #include <asm-generic/gpio.h> arch/arm/lib/vectors.S +0
-0@@ -67,8 +67,11 @@ * (1) defines '_start:' as appropriate * (2) inserts the vector table using ARM_VECTORS as appropriate
arch/arm/lib/vectors.S line 77
Quoted 10 lines
arch/arm/lib/vectors.S +4
-1*/ +#ifdef CONFIG_ARCH_ROCKCHIP +#include <asm/arch-rockchip/boot0.h> +#else #include <asm/arch/boot0.h> - +#endif #else /*
Hi,
All vendors has the same issue here, like Amlogic, but we use "meson" as $(SOC), if every vendor add its own specific include in common headers like this, this won't scale...
We should fix all this CONFIG_SOC instead of adding this, by maybe using the SYS_VENDOR for the arch include dir ?
Neil
PATCH 1/3 rockchip: arm: use 'arch-rockchip' for common header
Quoted 60 lines · Neil Armstrong
Quoted 46 lines · Kever Yang
rockchip platform header file is in 'arch-rockchip' instead of arch-$(SOC) for all SoCs.
Signed-off-by Kever Yang <[email protected]>---
arch/arm/cpu/armv8/start.S | 4 ++++ arch/arm/include/asm/gpio.h | 2 +- arch/arm/lib/vectors.S | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-)arch/arm/cpu/armv8/start.S +4
-0@@ -26,7 +26,11 @@ _start: * order to boot, allow them to set that in their boot0.h file and then * use it here. */ +#ifdef CONFIG_ARCH_ROCKCHIP +#include <asm/arch-rockchip/boot0.h> +#else #include <asm/arch/boot0.h> +#endif #else b reset #endifarch/arm/include/asm/gpio.h +1
-1@@ -1,5 +1,5 @@#if !defined(CONFIG_ARCH_UNIPHIER ) && !defined(CONFIG_ARCH_STI ) && \ - !defined(CONFIG_ARCH_K3 ) + !defined(CONFIG_ARCH_K3 ) && !defined(CONFIG_ARCH_ROCKCHIP )#include <asm/arch/gpio.h> #endif #include <asm-generic/gpio.h> arch/arm/lib/vectors.S +0
-0@@ -67,8 +67,11 @@ * (1) defines '_start:' as appropriate * (2) inserts the vector table using ARM_VECTORS as appropriatearch/arm/lib/vectors.S line 77
Quoted 10 lines
arch/arm/lib/vectors.S +4
-1*/ +#ifdef CONFIG_ARCH_ROCKCHIP +#include <asm/arch-rockchip/boot0.h> +#else #include <asm/arch/boot0.h> - +#endif #else /*Hi,
Quoted 6 lines
All vendors has the same issue here, like Amlogic, but we use "meson" as $(SOC), if every vendor add its own specific include in common headers like this, this won't scale...
We should fix all this
CONFIG_SOCinstead of adding this, by maybe using theSYS_VENDORfor the arch include dir ?
We should either:
- Grab the mechanism currently used in the kernel to allow for another high-level symlink to happen and re-org our files like this to allow for that
- In these cases, at least for now have <asm/arch-$(SOC)/boot0.h> grab the appropriate <asm/subdir/boot0.h> like we do on other files, and do the first option later.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190401/faf8d229/attachment.sig>
PATCH 1/3 rockchip: arm: use 'arch-rockchip' for common header
Hi Tom, Neil,
Quoted 66 lines · Tom Rini
Quoted 59 lines · Neil Armstrong
Quoted 46 lines · Kever Yang
rockchip platform header file is in 'arch-rockchip' instead of arch-$(SOC) for all SoCs.
Signed-off-by Kever Yang <[email protected]>---
arch/arm/cpu/armv8/start.S | 4 ++++ arch/arm/include/asm/gpio.h | 2 +- arch/arm/lib/vectors.S | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-)arch/arm/cpu/armv8/start.S +4
-0@@ -26,7 +26,11 @@ _start: * order to boot, allow them to set that in their boot0.h file and then * use it here. */ +#ifdef CONFIG_ARCH_ROCKCHIP +#include <asm/arch-rockchip/boot0.h> +#else #include <asm/arch/boot0.h> +#endif #else b reset #endifarch/arm/include/asm/gpio.h +1
-1@@ -1,5 +1,5 @@#if !defined(CONFIG_ARCH_UNIPHIER ) && !defined(CONFIG_ARCH_STI ) && \ - !defined(CONFIG_ARCH_K3 ) + !defined(CONFIG_ARCH_K3 ) && !defined(CONFIG_ARCH_ROCKCHIP )#include <asm/arch/gpio.h> #endif #include <asm-generic/gpio.h> arch/arm/lib/vectors.S +0
-0@@ -67,8 +67,11 @@ * (1) defines '_start:' as appropriate * (2) inserts the vector table using ARM_VECTORS as appropriatearch/arm/lib/vectors.S line 77
Quoted 10 lines
arch/arm/lib/vectors.S +4
-1*/ +#ifdef CONFIG_ARCH_ROCKCHIP +#include <asm/arch-rockchip/boot0.h> +#else #include <asm/arch/boot0.h> - +#endif #else /*Hi,
Quoted 6 lines
All vendors has the same issue here, like Amlogic, but we use "meson" as $(SOC), if every vendor add its own specific include in common headers like this, this won't scale...
We should fix all this
CONFIG_SOCinstead of adding this, by maybe using theSYS_VENDORfor the arch include dir ?
Quoted 7 lines
We should either:
- Grab the mechanism currently used in the kernel to allow for another high-level symlink to happen and re-org our files like this to allow for that
- In these cases, at least for now have <asm/arch-$(SOC)/boot0.h> grab the appropriate <asm/subdir/boot0.h> like we do on other files, and do the first option later.
Thanks for your comments, I also feel not good with this patch, so I will make individual
folder for different soc in next version, but I think this make redundant code in SoC side.
Maybe it will be better when high-level symlink happens.
Thanks,
- Kever
PATCH 1/3 rockchip: arm: use 'arch-rockchip' for common header
In reply to Kever YangQuoted 12 lines
rockchip platform header file is in 'arch-rockchip' instead of arch-$(SOC) for all SoCs.
Signed-off-by Kever Yang <[email protected]>Reviewed-by Philipp Tomsich <[email protected]>---
arch/arm/cpu/armv8/start.S | 4 ++++ arch/arm/include/asm/gpio.h | 2 +- arch/arm/lib/vectors.S | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-)
Applied to u-boot-rockchip, thanks!
PATCH 2/3 rockchip: use 'arch-rockchip' as header file path
In reply to Kever YangRockchip use 'arch-rockchip' instead of arch-$(SOC) as common header file path, so that we can get the correct path directly.
---
.../include/asm/arch-rockchip/ddr_rk3188.h | 2 +- arch/arm/mach-rockchip/Kconfig | 2 +- arch/arm/mach-rockchip/boot_mode.c | 2 +- arch/arm/mach-rockchip/bootrom.c | 4 ++-- arch/arm/mach-rockchip/rk3036-board-spl.c | 12 +++++------ arch/arm/mach-rockchip/rk3036-board.c | 10 +++++----- arch/arm/mach-rockchip/rk3036/clk_rk3036.c | 4 ++-- arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | 12 +++++------ arch/arm/mach-rockchip/rk3036/syscon_rk3036.c | 2 +- arch/arm/mach-rockchip/rk3128-board.c | 10 +++++----- arch/arm/mach-rockchip/rk3128/clk_rk3128.c | 4 ++-- arch/arm/mach-rockchip/rk3128/syscon_rk3128.c | 2 +- arch/arm/mach-rockchip/rk3188-board-spl.c | 16 +++++++-------- arch/arm/mach-rockchip/rk3188-board.c | 10 +++++----- arch/arm/mach-rockchip/rk3188/clk_rk3188.c | 4 ++-- arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 2 +- arch/arm/mach-rockchip/rk322x-board-spl.c | 12 +++++------ arch/arm/mach-rockchip/rk322x-board.c | 10 +++++----- arch/arm/mach-rockchip/rk322x/clk_rk322x.c | 4 ++-- arch/arm/mach-rockchip/rk322x/syscon_rk322x.c | 2 +- arch/arm/mach-rockchip/rk3288-board-spl.c | 20 +++++++++---------- arch/arm/mach-rockchip/rk3288-board-tpl.c | 14 ++++++------- arch/arm/mach-rockchip/rk3288-board.c | 12 +++++------ arch/arm/mach-rockchip/rk3288/clk_rk3288.c | 4 ++-- arch/arm/mach-rockchip/rk3288/rk3288.c | 2 +- arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 2 +- arch/arm/mach-rockchip/rk3328/clk_rk3328.c | 4 ++-- arch/arm/mach-rockchip/rk3328/rk3328.c | 2 +- arch/arm/mach-rockchip/rk3328/syscon_rk3328.c | 2 +- arch/arm/mach-rockchip/rk3368-board-spl.c | 10 +++++----- arch/arm/mach-rockchip/rk3368-board-tpl.c | 12 +++++------ arch/arm/mach-rockchip/rk3368/clk_rk3368.c | 4 ++-- arch/arm/mach-rockchip/rk3368/rk3368.c | 6 +++--- arch/arm/mach-rockchip/rk3368/syscon_rk3368.c | 2 +- arch/arm/mach-rockchip/rk3399-board-spl.c | 12 +++++------ arch/arm/mach-rockchip/rk3399-board.c | 2 +- arch/arm/mach-rockchip/rk3399/clk_rk3399.c | 4 ++-- arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +- arch/arm/mach-rockchip/rk3399/syscon_rk3399.c | 2 +- arch/arm/mach-rockchip/rk_timer.c | 2 +- arch/arm/mach-rockchip/rv1108/clk_rv1108.c | 4 ++-- arch/arm/mach-rockchip/rv1108/syscon_rv1108.c | 2 +- arch/arm/mach-rockchip/sdram_common.c | 2 +- board/elgin/elgin_rv1108/elgin_rv1108.c | 4 ++-- board/rockchip/evb_rk3036/evb_rk3036.c | 4 ++-- board/rockchip/evb_rk3229/evb_rk3229.c | 2 +- board/rockchip/evb_rk3399/evb-rk3399.c | 2 +- board/rockchip/evb_rv1108/evb_rv1108.c | 4 ++-- board/rockchip/kylin_rk3036/kylin_rk3036.c | 4 ++-- board/rockchip/sheep_rk3368/sheep_rk3368.c | 4 ++-- .../lion_rk3368/lion_rk3368.c | 6 +++--- .../puma_rk3399/puma-rk3399.c | 10 +++++----- board/vamrs/rock960_rk3399/rock960-rk3399.c | 2 +- cmd/rockusb.c | 2 +- drivers/clk/rockchip/clk_rk3036.c | 6 +++--- drivers/clk/rockchip/clk_rk3128.c | 6 +++--- drivers/clk/rockchip/clk_rk3188.c | 8 ++++---- drivers/clk/rockchip/clk_rk322x.c | 6 +++--- drivers/clk/rockchip/clk_rk3288.c | 8 ++++---- drivers/clk/rockchip/clk_rk3328.c | 8 ++++---- drivers/clk/rockchip/clk_rk3368.c | 6 +++--- drivers/clk/rockchip/clk_rk3399.c | 6 +++--- drivers/clk/rockchip/clk_rv1108.c | 6 +++--- drivers/gpio/rk_gpio.c | 3 ++- drivers/i2c/rk_i2c.c | 6 +++--- drivers/mmc/rockchip_dw_mmc.c | 4 ++-- drivers/net/gmac_rockchip.c | 18 ++++++++--------- drivers/pwm/rk_pwm.c | 2 +- drivers/ram/rockchip/dmc-rk3368.c | 12 +++++------ drivers/ram/rockchip/sdram_rk3128.c | 6 +++--- drivers/ram/rockchip/sdram_rk3188.c | 14 ++++++------- drivers/ram/rockchip/sdram_rk322x.c | 16 +++++++-------- drivers/ram/rockchip/sdram_rk3288.c | 14 ++++++------- drivers/ram/rockchip/sdram_rk3328.c | 6 +++--- drivers/ram/rockchip/sdram_rk3399.c | 12 +++++------ drivers/reset/reset-rockchip.c | 2 +- drivers/serial/serial_rockchip.c | 2 +- drivers/sound/rockchip_sound.c | 2 +- drivers/spi/rk_spi.c | 4 ++-- drivers/sysreset/sysreset_rockchip.c | 6 +++--- drivers/timer/rockchip_timer.c | 2 +- drivers/usb/gadget/f_rockusb.c | 2 +- drivers/video/rockchip/rk3288_hdmi.c | 6 +++--- drivers/video/rockchip/rk3288_mipi.c | 10 +++++----- drivers/video/rockchip/rk3288_vop.c | 6 +++--- drivers/video/rockchip/rk3399_hdmi.c | 6 +++--- drivers/video/rockchip/rk3399_mipi.c | 10 +++++----- drivers/video/rockchip/rk3399_vop.c | 2 +- drivers/video/rockchip/rk_edp.c | 6 +++--- drivers/video/rockchip/rk_hdmi.c | 5 ++--- drivers/video/rockchip/rk_lvds.c | 6 +++--- drivers/video/rockchip/rk_mipi.c | 9 ++++----- drivers/video/rockchip/rk_vop.c | 7 +++---- drivers/video/rockchip/rk_vop.h | 2 +- include/configs/rk3036_common.h | 2 +- include/configs/rk3188_common.h | 2 +- include/configs/rk322x_common.h | 2 +- include/configs/rk3288_common.h | 2 +- include/configs/rk3368_common.h | 2 +- include/configs/rv1108_common.h | 2 +- 100 files changed, 288 insertions(+), 290 deletions(-)
arch/arm/include/asm/arch-rockchip/ddr_rk3188.h +1 -1
@@ -6,7 +6,7 @@#ifndef _ASM_ARCH_DDR_RK3188_H#define _ASM_ARCH_DDR_RK3188_H -#include <asm/arch/ddr_rk3288.h> +#include <asm/arch-rockchip/ddr_rk3288.h> /* * RK3188 Memory scheduler register map.
arch/arm/mach-rockchip/Kconfig +1 -1
@@ -193,7 +193,7 @@ config ROCKCHIP_BOOT_MODE_REG default 0x10300580 if ROCKCHIP_RV1108 default 0 help - The Soc will enter to different boot mode(defined in asm/arch/boot_mode.h) + The Soc will enter to different boot mode(defined in asm/arch-rockchip/boot_mode.h) according to the value from this register. config ROCKCHIP_SPL_RESERVE_IRAM
arch/arm/mach-rockchip/boot_mode.c +1 -1
@@ -6,7 +6,7 @@#include <common.h> #include <adc.h> #include <asm/io.h> -#include <asm/arch/boot_mode.h> +#include <asm/arch-rockchip/boot_mode.h> #if (CONFIG_ROCKCHIP_BOOT_MODE_REG ==0 )
arch/arm/mach-rockchip/bootrom.c +2 -2
@@ -4,8 +4,8 @@*/ #include <common.h> -#include <asm/arch/bootrom.h> -#include <asm/arch/boot_mode.h> +#include <asm/arch-rockchip/bootrom.h> +#include <asm/arch-rockchip/boot_mode.h> #include <asm/io.h> #include <asm/setjmp.h> #include <asm/system.h>
arch/arm/mach-rockchip/rk3036-board-spl.c +6 -6
@@ -6,12 +6,12 @@#include <common.h> #include <debug_uart.h> #include <asm/io.h> -#include <asm/arch/bootrom.h> -#include <asm/arch/grf_rk3036.h> -#include <asm/arch/hardware.h> -#include <asm/arch/sdram_rk3036.h> -#include <asm/arch/timer.h> -#include <asm/arch/uart.h> +#include <asm/arch-rockchip/bootrom.h> +#include <asm/arch-rockchip/grf_rk3036.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/sdram_rk3036.h> +#include <asm/arch-rockchip/timer.h> +#include <asm/arch-rockchip/uart.h> #define GRF_BASE 0x20008000
arch/arm/mach-rockchip/rk3036-board.c +5 -5
@@ -9,11 +9,11 @@#include <ram.h> #include <asm/gpio.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/periph.h> -#include <asm/arch/grf_rk3036.h> -#include <asm/arch/boot_mode.h> -#include <asm/arch/sdram_rk3036.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/periph.h> +#include <asm/arch-rockchip/grf_rk3036.h> +#include <asm/arch-rockchip/boot_mode.h> +#include <asm/arch-rockchip/sdram_rk3036.h> #include <dm/pinctrl.h> DECLARE_GLOBAL_DATA_PTR ;
arch/arm/mach-rockchip/rk3036/clk_rk3036.c +2 -2
@@ -7,8 +7,8 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3036.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3036.h> int rockchip_get_clk (struct udevice **devp) {
arch/arm/mach-rockchip/rk3036/sdram_rk3036.c +6 -6
@@ -5,12 +5,12 @@#include <common.h> #include <asm/io.h> #include <asm/types.h> -#include <asm/arch/cru_rk3036.h> -#include <asm/arch/grf_rk3036.h> -#include <asm/arch/hardware.h> -#include <asm/arch/sdram_rk3036.h> -#include <asm/arch/timer.h> -#include <asm/arch/uart.h> +#include <asm/arch-rockchip/cru_rk3036.h> +#include <asm/arch-rockchip/grf_rk3036.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/sdram_rk3036.h> +#include <asm/arch-rockchip/timer.h> +#include <asm/arch-rockchip/uart.h> /* * we can not fit the code to access the device tree in SPL
arch/arm/mach-rockchip/rk3036/syscon_rk3036.c +1 -1
@@ -6,7 +6,7 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> +#include <asm/arch-rockchip/clock.h> static const struct udevice_id rk3036_syscon_ids[] = { { .compatible ="rockchip,rk3036-grf" , .data =ROCKCHIP_SYSCON_GRF },
arch/arm/mach-rockchip/rk3128-board.c +5 -5
@@ -8,11 +8,11 @@#include <ram.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/periph.h> -#include <asm/arch/grf_rk3128.h> -#include <asm/arch/boot_mode.h> -#include <asm/arch/timer.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/periph.h> +#include <asm/arch-rockchip/grf_rk3128.h> +#include <asm/arch-rockchip/boot_mode.h> +#include <asm/arch-rockchip/timer.h> #include <power/regulator.h> DECLARE_GLOBAL_DATA_PTR ;
arch/arm/mach-rockchip/rk3128/clk_rk3128.c +2 -2
@@ -6,8 +6,8 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3128.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3128.h> int rockchip_get_clk (struct udevice **devp) {
arch/arm/mach-rockchip/rk3128/syscon_rk3128.c +1 -1
@@ -6,7 +6,7 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> +#include <asm/arch-rockchip/clock.h> static const struct udevice_id rk3128_syscon_ids[] = { { .compatible ="rockchip,rk3128-grf" , .data =ROCKCHIP_SYSCON_GRF },
arch/arm/mach-rockchip/rk3188-board-spl.c +8 -8
@@ -15,14 +15,14 @@#include <syscon.h> #include <asm/gpio.h> #include <asm/io.h> -#include <asm/arch/bootrom.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3188.h> -#include <asm/arch/hardware.h> -#include <asm/arch/periph.h> -#include <asm/arch/pmu_rk3188.h> -#include <asm/arch/sdram.h> -#include <asm/arch/timer.h> +#include <asm/arch-rockchip/bootrom.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/grf_rk3188.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/periph.h> +#include <asm/arch-rockchip/pmu_rk3188.h> +#include <asm/arch-rockchip/sdram.h> +#include <asm/arch-rockchip/timer.h> #include <dm/pinctrl.h> #include <dm/root.h> #include <dm/test.h>
arch/arm/mach-rockchip/rk3188-board.c +5 -5
@@ -10,11 +10,11 @@#include <syscon.h> #include <asm/gpio.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3188.h> -#include <asm/arch/periph.h> -#include <asm/arch/pmu_rk3288.h> -#include <asm/arch/boot_mode.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/grf_rk3188.h> +#include <asm/arch-rockchip/periph.h> +#include <asm/arch-rockchip/pmu_rk3288.h> +#include <asm/arch-rockchip/boot_mode.h> #include <dm/pinctrl.h> __weak int rk_board_late_init (void )
arch/arm/mach-rockchip/rk3188/clk_rk3188.c +2 -2
@@ -7,8 +7,8 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3188.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3188.h> int rockchip_get_clk (struct udevice **devp) {
arch/arm/mach-rockchip/rk3188/syscon_rk3188.c +1 -1
@@ -7,7 +7,7 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> +#include <asm/arch-rockchip/clock.h> static const struct udevice_id rk3188_syscon_ids[] = { { .compatible ="rockchip,rk3188-noc" , .data =ROCKCHIP_SYSCON_NOC },
arch/arm/mach-rockchip/rk322x-board-spl.c +6 -6
@@ -9,12 +9,12 @@#include <ram.h> #include <spl.h> #include <asm/io.h> -#include <asm/arch/bootrom.h> -#include <asm/arch/cru_rk322x.h> -#include <asm/arch/grf_rk322x.h> -#include <asm/arch/hardware.h> -#include <asm/arch/timer.h> -#include <asm/arch/uart.h> +#include <asm/arch-rockchip/bootrom.h> +#include <asm/arch-rockchip/cru_rk322x.h> +#include <asm/arch-rockchip/grf_rk322x.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/timer.h> +#include <asm/arch-rockchip/uart.h> u32 spl_boot_device (void ) {
arch/arm/mach-rockchip/rk322x-board.c +5 -5
@@ -8,10 +8,10 @@#include <ram.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/boot_mode.h> -#include <asm/arch/clock.h> -#include <asm/arch/periph.h> -#include <asm/arch/grf_rk322x.h> +#include <asm/arch-rockchip/boot_mode.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/periph.h> +#include <asm/arch-rockchip/grf_rk322x.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -29,7 +29,7 @@ int board_late_init(void)int board_init (void ) { -#include <asm/arch/grf_rk322x.h> +#include <asm/arch-rockchip/grf_rk322x.h> /* Enable early UART2 channel 1 on the RK322x */ #define GRF_BASE 0x11000000struct rk322x_grf *const grf = (void *)GRF_BASE ;
arch/arm/mach-rockchip/rk322x/clk_rk322x.c +2 -2
@@ -6,8 +6,8 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk322x.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk322x.h> int rockchip_get_clk (struct udevice **devp) {
arch/arm/mach-rockchip/rk322x/syscon_rk322x.c +1 -1
@@ -6,7 +6,7 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> +#include <asm/arch-rockchip/clock.h> static const struct udevice_id rk322x_syscon_ids[] = { { .compatible ="rockchip,rk3228-grf" , .data =ROCKCHIP_SYSCON_GRF },
arch/arm/mach-rockchip/rk3288-board-spl.c +10 -10
@@ -14,15 +14,15 @@#include <spl.h> #include <asm/gpio.h> #include <asm/io.h> -#include <asm/arch/bootrom.h> -#include <asm/arch/clock.h> -#include <asm/arch/hardware.h> -#include <asm/arch/periph.h> -#include <asm/arch/pmu_rk3288.h> -#include <asm/arch/sdram.h> -#include <asm/arch/sdram_common.h> -#include <asm/arch/sys_proto.h> -#include <asm/arch/timer.h> +#include <asm/arch-rockchip/bootrom.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/periph.h> +#include <asm/arch-rockchip/pmu_rk3288.h> +#include <asm/arch-rockchip/sdram.h> +#include <asm/arch-rockchip/sdram_common.h> +#include <asm/arch-rockchip/sys_proto.h> +#include <asm/arch-rockchip/timer.h> #include <dm/pinctrl.h> #include <dm/root.h> #include <dm/test.h>
@@ -110,7 +110,7 @@ void board_init_f(ulong dummy)int ret;/* Example code showing how to enable the debug UART on RK3288 */ -#include <asm/arch/grf_rk3288.h> +#include <asm/arch-rockchip/grf_rk3288.h> /* Enable early UART on the RK3288 */ #define GRF_BASE 0xff770000struct rk3288_grf *const grf = (void *)GRF_BASE ;
arch/arm/mach-rockchip/rk3288-board-tpl.c +7 -7
@@ -10,13 +10,13 @@#include <spl.h> #include <version.h> #include <asm/io.h> -#include <asm/arch/bootrom.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3288.h> -#include <asm/arch/periph.h> -#include <asm/arch/pmu_rk3288.h> -#include <asm/arch/sys_proto.h> -#include <asm/arch/timer.h> +#include <asm/arch-rockchip/bootrom.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/grf_rk3288.h> +#include <asm/arch-rockchip/periph.h> +#include <asm/arch-rockchip/pmu_rk3288.h> +#include <asm/arch-rockchip/sys_proto.h> +#include <asm/arch-rockchip/timer.h> #define GRF_BASE 0xff770000void board_init_f (ulong dummy)
arch/arm/mach-rockchip/rk3288-board.c +6 -6
@@ -9,12 +9,12 @@#include <ram.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3288.h> -#include <asm/arch/periph.h> -#include <asm/arch/pmu_rk3288.h> -#include <asm/arch/qos_rk3288.h> -#include <asm/arch/boot_mode.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3288.h> +#include <asm/arch-rockchip/periph.h> +#include <asm/arch-rockchip/pmu_rk3288.h> +#include <asm/arch-rockchip/qos_rk3288.h> +#include <asm/arch-rockchip/boot_mode.h> #include <asm/gpio.h> #include <dm/pinctrl.h> #include <dt-bindings/clock/rk3288-cru.h>
arch/arm/mach-rockchip/rk3288/clk_rk3288.c +2 -2
@@ -7,8 +7,8 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3288.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3288.h> int rockchip_get_clk (struct udevice **devp) {
arch/arm/mach-rockchip/rk3288/rk3288.c +1 -1
@@ -3,7 +3,7 @@* Copyright (c) 2016 Rockchip Electronics Co., Ltd */ #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/hardware.h> #define GRF_SOC_CON2 0xff77024c
arch/arm/mach-rockchip/rk3288/syscon_rk3288.c +1 -1
@@ -7,7 +7,7 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> +#include <asm/arch-rockchip/clock.h> static const struct udevice_id rk3288_syscon_ids[] = { { .compatible ="rockchip,rk3288-noc" , .data =ROCKCHIP_SYSCON_NOC },
arch/arm/mach-rockchip/rk3328/clk_rk3328.c +2 -2
@@ -5,8 +5,8 @@#include <common.h> #include <dm.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3328.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3328.h> int rockchip_get_clk (struct udevice **devp) {
arch/arm/mach-rockchip/rk3328/rk3328.c +1 -1
@@ -4,7 +4,7 @@*/ #include <common.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/hardware.h> #include <asm/armv8/mmu.h> #include <asm/io.h>
arch/arm/mach-rockchip/rk3328/syscon_rk3328.c +1 -1
@@ -4,7 +4,7 @@*/ #include <common.h> -#include <asm/arch/clock.h> +#include <asm/arch-rockchip/clock.h> #include <dm.h> #include <syscon.h>
arch/arm/mach-rockchip/rk3368-board-spl.c +5 -5
@@ -9,11 +9,11 @@#include <ram.h> #include <spl.h> #include <asm/io.h> -#include <asm/arch/cru_rk3368.h> -#include <asm/arch/grf_rk3368.h> -#include <asm/arch/hardware.h> -#include <asm/arch/periph.h> -#include <asm/arch/timer.h> +#include <asm/arch-rockchip/cru_rk3368.h> +#include <asm/arch-rockchip/grf_rk3368.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/periph.h> +#include <asm/arch-rockchip/timer.h> #include <dm/pinctrl.h> void board_debug_uart_init (void )
arch/arm/mach-rockchip/rk3368-board-tpl.c +6 -6
@@ -10,12 +10,12 @@#include <spl.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/bootrom.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3368.h> -#include <asm/arch/grf_rk3368.h> -#include <asm/arch/hardware.h> -#include <asm/arch/timer.h> +#include <asm/arch-rockchip/bootrom.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3368.h> +#include <asm/arch-rockchip/grf_rk3368.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/timer.h> /* * The SPL (and also the full U-Boot stage on the RK3368) will run in
arch/arm/mach-rockchip/rk3368/clk_rk3368.c +2 -2
@@ -7,8 +7,8 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3368.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3368.h> int rockchip_get_clk (struct udevice **devp) {
arch/arm/mach-rockchip/rk3368/rk3368.c +3 -3
@@ -7,9 +7,9 @@#include <common.h> #include <asm/armv8/mmu.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3368.h> -#include <asm/arch/grf_rk3368.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3368.h> +#include <asm/arch-rockchip/grf_rk3368.h> #include <syscon.h> DECLARE_GLOBAL_DATA_PTR ;
arch/arm/mach-rockchip/rk3368/syscon_rk3368.c +1 -1
@@ -8,7 +8,7 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> +#include <asm/arch-rockchip/clock.h> static const struct udevice_id rk3368_syscon_ids[] = { { .compatible ="rockchip,rk3368-grf" ,
arch/arm/mach-rockchip/rk3399-board-spl.c +6 -6
@@ -12,12 +12,12 @@#include <spl_gpio.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/bootrom.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3399.h> -#include <asm/arch/hardware.h> -#include <asm/arch/periph.h> -#include <asm/arch/sys_proto.h> +#include <asm/arch-rockchip/bootrom.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/grf_rk3399.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/periph.h> +#include <asm/arch-rockchip/sys_proto.h> #include <dm/pinctrl.h> void board_return_to_bootrom (void )
arch/arm/mach-rockchip/rk3399-board.c +1 -1
@@ -4,7 +4,7 @@*/ #include <common.h> -#include <asm/arch/boot_mode.h> +#include <asm/arch-rockchip/boot_mode.h> int board_late_init (void ) {
arch/arm/mach-rockchip/rk3399/clk_rk3399.c +2 -2
@@ -7,8 +7,8 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3399.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3399.h> static int rockchip_get_cruclk (struct udevice **devp) {
arch/arm/mach-rockchip/rk3399/rk3399.c +1 -1
@@ -6,7 +6,7 @@#include <common.h> #include <asm/armv8/mmu.h> #include <asm/io.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/hardware.h> DECLARE_GLOBAL_DATA_PTR ;
arch/arm/mach-rockchip/rk3399/syscon_rk3399.c +1 -1
@@ -6,7 +6,7 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> +#include <asm/arch-rockchip/clock.h> static const struct udevice_id rk3399_syscon_ids[] = { { .compatible ="rockchip,rk3399-grf" , .data =ROCKCHIP_SYSCON_GRF },
arch/arm/mach-rockchip/rk_timer.c +1 -1
@@ -4,7 +4,7 @@*/ #include <common.h> -#include <asm/arch/timer.h> +#include <asm/arch-rockchip/timer.h> #include <asm/io.h> #include <linux/types.h>
arch/arm/mach-rockchip/rv1108/clk_rv1108.c +2 -2
@@ -7,8 +7,8 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rv1108.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rv1108.h> int rockchip_get_clk (struct udevice **devp) {
arch/arm/mach-rockchip/rv1108/syscon_rv1108.c +1 -1
@@ -6,7 +6,7 @@#include <common.h> #include <dm.h> #include <syscon.h> -#include <asm/arch/clock.h> +#include <asm/arch-rockchip/clock.h> static const struct udevice_id rv1108_syscon_ids[] = { { .compatible ="rockchip,rv1108-grf" , .data =ROCKCHIP_SYSCON_GRF },
arch/arm/mach-rockchip/sdram_common.c +1 -1
@@ -7,7 +7,7 @@#include <dm.h> #include <ram.h> #include <asm/io.h> -#include <asm/arch/sdram_common.h> +#include <asm/arch-rockchip/sdram_common.h> #include <dm/uclass-internal.h> DECLARE_GLOBAL_DATA_PTR ;
board/elgin/elgin_rv1108/elgin_rv1108.c +2 -2
@@ -7,8 +7,8 @@#include <common.h> #include <asm/io.h> #include <fdtdec.h> -#include <asm/arch/grf_rv1108.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/grf_rv1108.h> +#include <asm/arch-rockchip/hardware.h> #include <asm/gpio.h> DECLARE_GLOBAL_DATA_PTR ;
board/rockchip/evb_rk3036/evb_rk3036.c +2 -2
@@ -6,8 +6,8 @@#include <common.h> #include <dm.h> #include <asm/io.h> -#include <asm/arch/uart.h> -#include <asm/arch/sdram_rk3036.h> +#include <asm/arch-rockchip/uart.h> +#include <asm/arch-rockchip/sdram_rk3036.h> void get_ddr_config (struct rk3036_ddr_config *config) {
board/rockchip/evb_rk3229/evb_rk3229.c +1 -1
@@ -6,5 +6,5 @@#include <common.h> #include <dm.h> #include <asm/io.h> -#include <asm/arch/uart.h> +#include <asm/arch-rockchip/uart.h>
board/rockchip/evb_rk3399/evb-rk3399.c +1 -1
@@ -7,7 +7,7 @@#include <dm.h> #include <dm/pinctrl.h> #include <dm/uclass-internal.h> -#include <asm/arch/periph.h> +#include <asm/arch-rockchip/periph.h> #include <power/regulator.h> #include <spl.h>
board/rockchip/evb_rv1108/evb_rv1108.c +2 -2
@@ -7,8 +7,8 @@#include <common.h> #include <asm/io.h> #include <fdtdec.h> -#include <asm/arch/grf_rv1108.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/grf_rv1108.h> +#include <asm/arch-rockchip/hardware.h> DECLARE_GLOBAL_DATA_PTR ;
board/rockchip/kylin_rk3036/kylin_rk3036.c +2 -2
@@ -6,8 +6,8 @@#include <common.h> #include <dm.h> #include <asm/io.h> -#include <asm/arch/uart.h> -#include <asm/arch/sdram_rk3036.h> +#include <asm/arch-rockchip/uart.h> +#include <asm/arch-rockchip/sdram_rk3036.h> #include <asm/gpio.h> void get_ddr_config (struct rk3036_ddr_config *config)
board/rockchip/sheep_rk3368/sheep_rk3368.c +2 -2
@@ -4,8 +4,8 @@*/ #include <common.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3368.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/grf_rk3368.h> #include <syscon.h> int mach_cpu_init (void )
board/theobroma-systems/lion_rk3368/lion_rk3368.c +3 -3
@@ -6,9 +6,9 @@#include <dm.h> #include <ram.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3368.h> -#include <asm/arch/timer.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/grf_rk3368.h> +#include <asm/arch-rockchip/timer.h> #include <syscon.h> int mach_cpu_init (void )
board/theobroma-systems/puma_rk3399/puma-rk3399.c +5 -5
@@ -15,11 +15,11 @@#include <asm/io.h> #include <asm/gpio.h> #include <asm/setup.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3399.h> -#include <asm/arch/hardware.h> -#include <asm/arch/grf_rk3399.h> -#include <asm/arch/periph.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3399.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/grf_rk3399.h> +#include <asm/arch-rockchip/periph.h> #include <power/regulator.h> #include <u-boot/sha256.h>
board/vamrs/rock960_rk3399/rock960-rk3399.c +1 -1
@@ -7,7 +7,7 @@#include <dm.h> #include <dm/pinctrl.h> #include <dm/uclass-internal.h> -#include <asm/arch/periph.h> +#include <asm/arch-rockchip/periph.h> #include <power/regulator.h> #include <spl.h>
cmd/rockusb.c +1 -1
@@ -8,7 +8,7 @@#include <console.h> #include <g_dnl.h> #include <usb.h> -#include <asm/arch/f_rockusb.h> +#include <asm/arch-rockchip/f_rockusb.h> static int do_rockusb (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) {
drivers/clk/rockchip/clk_rk3036.c +3 -3
@@ -9,9 +9,9 @@#include <errno.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3036.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3036.h> +#include <asm/arch-rockchip/hardware.h> #include <dm/lists.h> #include <dt-bindings/clock/rk3036-cru.h> #include <linux/log2.h>
drivers/clk/rockchip/clk_rk3128.c +3 -3
@@ -9,9 +9,9 @@#include <errno.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3128.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3128.h> +#include <asm/arch-rockchip/hardware.h> #include <bitfield.h> #include <dm/lists.h> #include <dt-bindings/clock/rk3128-cru.h>
drivers/clk/rockchip/clk_rk3188.c +4 -4
@@ -12,10 +12,10 @@#include <mapmem.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3188.h> -#include <asm/arch/grf_rk3188.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3188.h> +#include <asm/arch-rockchip/grf_rk3188.h> +#include <asm/arch-rockchip/hardware.h> #include <dt-bindings/clock/rk3188-cru.h> #include <dm/device-internal.h> #include <dm/lists.h>
drivers/clk/rockchip/clk_rk322x.c +3 -3
@@ -9,9 +9,9 @@#include <errno.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk322x.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk322x.h> +#include <asm/arch-rockchip/hardware.h> #include <dm/lists.h> #include <dt-bindings/clock/rk3228-cru.h> #include <linux/log2.h>
drivers/clk/rockchip/clk_rk3288.c +4 -4
@@ -13,10 +13,10 @@#include <mapmem.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3288.h> -#include <asm/arch/grf_rk3288.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3288.h> +#include <asm/arch-rockchip/grf_rk3288.h> +#include <asm/arch-rockchip/hardware.h> #include <dt-bindings/clock/rk3288-cru.h> #include <dm/device-internal.h> #include <dm/lists.h>
drivers/clk/rockchip/clk_rk3328.c +4 -4
@@ -9,10 +9,10 @@#include <dm.h> #include <errno.h> #include <syscon.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3328.h> -#include <asm/arch/hardware.h> -#include <asm/arch/grf_rk3328.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3328.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/grf_rk3328.h> #include <asm/io.h> #include <dm/lists.h> #include <dt-bindings/clock/rk3328-cru.h>
drivers/clk/rockchip/clk_rk3368.c +3 -3
@@ -13,9 +13,9 @@#include <mapmem.h> #include <syscon.h> #include <bitfield.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3368.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3368.h> +#include <asm/arch-rockchip/hardware.h> #include <asm/io.h> #include <dm/lists.h> #include <dt-bindings/clock/rk3368-cru.h>
drivers/clk/rockchip/clk_rk3399.c +3 -3
@@ -13,9 +13,9 @@#include <syscon.h> #include <bitfield.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3399.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3399.h> +#include <asm/arch-rockchip/hardware.h> #include <dm/lists.h> #include <dt-bindings/clock/rk3399-cru.h>
drivers/clk/rockchip/clk_rv1108.c +3 -3
@@ -11,9 +11,9 @@#include <errno.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rv1108.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rv1108.h> +#include <asm/arch-rockchip/hardware.h> #include <dm/lists.h> #include <dt-bindings/clock/rv1108-cru.h>
drivers/gpio/rk_gpio.c +2 -1
@@ -12,7 +12,8 @@#include <linux/errno.h> #include <asm/gpio.h> #include <asm/io.h> -#include <asm/arch/clock.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/gpio.h> #include <dm/pinctrl.h> #include <dt-bindings/clock/rk3288-cru.h>
drivers/i2c/rk_i2c.c +3 -3
@@ -12,9 +12,9 @@#include <errno.h> #include <i2c.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/i2c.h> -#include <asm/arch/periph.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/i2c.h> +#include <asm/arch-rockchip/periph.h> #include <dm/pinctrl.h> #include <linux/sizes.h>
drivers/mmc/rockchip_dw_mmc.c +2 -2
@@ -13,8 +13,8 @@#include <pwrseq.h> #include <syscon.h> #include <asm/gpio.h> -#include <asm/arch/clock.h> -#include <asm/arch/periph.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/periph.h> #include <linux/err.h> struct rockchip_mmc_plat {
drivers/net/gmac_rockchip.c +9 -9
@@ -11,15 +11,15 @@#include <phy.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/periph.h> -#include <asm/arch/clock.h> -#include <asm/arch/hardware.h> -#include <asm/arch/grf_rk322x.h> -#include <asm/arch/grf_rk3288.h> -#include <asm/arch/grf_rk3328.h> -#include <asm/arch/grf_rk3368.h> -#include <asm/arch/grf_rk3399.h> -#include <asm/arch/grf_rv1108.h> +#include <asm/arch-rockchip/periph.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/grf_rk322x.h> +#include <asm/arch-rockchip/grf_rk3288.h> +#include <asm/arch-rockchip/grf_rk3328.h> +#include <asm/arch-rockchip/grf_rk3368.h> +#include <asm/arch-rockchip/grf_rk3399.h> +#include <asm/arch-rockchip/grf_rv1108.h> #include <dm/pinctrl.h> #include <dt-bindings/clock/rk3288-cru.h> #include "designware.h"
drivers/pwm/rk_pwm.c +1 -1
@@ -12,7 +12,7 @@#include <regmap.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/pwm.h> +#include <asm/arch-rockchip/pwm.h> #include <power/regulator.h> struct rk_pwm_priv {
drivers/ram/rockchip/dmc-rk3368.c +6 -6
@@ -12,12 +12,12 @@#include <regmap.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3368.h> -#include <asm/arch/grf_rk3368.h> -#include <asm/arch/ddr_rk3368.h> -#include <asm/arch/sdram.h> -#include <asm/arch/sdram_common.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3368.h> +#include <asm/arch-rockchip/grf_rk3368.h> +#include <asm/arch-rockchip/ddr_rk3368.h> +#include <asm/arch-rockchip/sdram.h> +#include <asm/arch-rockchip/sdram_common.h> struct dram_info {struct ram_info info;
drivers/ram/rockchip/sdram_rk3128.c +3 -3
@@ -7,9 +7,9 @@#include <dm.h> #include <ram.h> #include <syscon.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3128.h> -#include <asm/arch/sdram_common.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/grf_rk3128.h> +#include <asm/arch-rockchip/sdram_common.h> struct dram_info {struct ram_info info;
drivers/ram/rockchip/sdram_rk3188.c +7 -7
@@ -15,13 +15,13 @@#include <regmap.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3188.h> -#include <asm/arch/ddr_rk3188.h> -#include <asm/arch/grf_rk3188.h> -#include <asm/arch/pmu_rk3188.h> -#include <asm/arch/sdram.h> -#include <asm/arch/sdram_common.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3188.h> +#include <asm/arch-rockchip/ddr_rk3188.h> +#include <asm/arch-rockchip/grf_rk3188.h> +#include <asm/arch-rockchip/pmu_rk3188.h> +#include <asm/arch-rockchip/sdram.h> +#include <asm/arch-rockchip/sdram_common.h> #include <linux/err.h> struct chan_info {
drivers/ram/rockchip/sdram_rk322x.c +8 -8
@@ -11,14 +11,14 @@#include <regmap.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk322x.h> -#include <asm/arch/grf_rk322x.h> -#include <asm/arch/hardware.h> -#include <asm/arch/sdram_rk322x.h> -#include <asm/arch/timer.h> -#include <asm/arch/uart.h> -#include <asm/arch/sdram_common.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk322x.h> +#include <asm/arch-rockchip/grf_rk322x.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/sdram_rk322x.h> +#include <asm/arch-rockchip/timer.h> +#include <asm/arch-rockchip/uart.h> +#include <asm/arch-rockchip/sdram_common.h> #include <asm/types.h> #include <linux/err.h>
drivers/ram/rockchip/sdram_rk3288.c +7 -7
@@ -15,13 +15,13 @@#include <regmap.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3288.h> -#include <asm/arch/ddr_rk3288.h> -#include <asm/arch/grf_rk3288.h> -#include <asm/arch/pmu_rk3288.h> -#include <asm/arch/sdram.h> -#include <asm/arch/sdram_common.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3288.h> +#include <asm/arch-rockchip/ddr_rk3288.h> +#include <asm/arch-rockchip/grf_rk3288.h> +#include <asm/arch-rockchip/pmu_rk3288.h> +#include <asm/arch-rockchip/sdram.h> +#include <asm/arch-rockchip/sdram_common.h> #include <linux/err.h> #include <power/regulator.h> #include <power/rk8xx_pmic.h>
drivers/ram/rockchip/sdram_rk3328.c +3 -3
@@ -7,9 +7,9 @@#include <dm.h> #include <ram.h> #include <syscon.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3328.h> -#include <asm/arch/sdram_common.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/grf_rk3328.h> +#include <asm/arch-rockchip/sdram_common.h> struct dram_info {struct ram_info info;
drivers/ram/rockchip/sdram_rk3399.c +6 -6
@@ -13,12 +13,12 @@#include <regmap.h> #include <syscon.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/sdram_common.h> -#include <asm/arch/sdram_rk3399.h> -#include <asm/arch/cru_rk3399.h> -#include <asm/arch/grf_rk3399.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/sdram_common.h> +#include <asm/arch-rockchip/sdram_rk3399.h> +#include <asm/arch-rockchip/cru_rk3399.h> +#include <asm/arch-rockchip/grf_rk3399.h> +#include <asm/arch-rockchip/hardware.h> #include <linux/err.h> #include <time.h>
drivers/reset/reset-rockchip.c +1 -1
@@ -7,7 +7,7 @@#include <dm.h> #include <reset-uclass.h> #include <linux/io.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/hardware.h> #include <dm/lists.h> /* * Each reg has 16 bits reset signal for devices
drivers/serial/serial_rockchip.c +1 -1
@@ -9,7 +9,7 @@#include <dt-structs.h> #include <ns16550.h> #include <serial.h> -#include <asm/arch/clock.h> +#include <asm/arch-rockchip/clock.h> #if defined(CONFIG_ROCKCHIP_RK3188 ) struct rockchip_uart_platdata {
drivers/sound/rockchip_sound.c +1 -1
@@ -13,7 +13,7 @@#include <i2s.h> #include <misc.h> #include <sound.h> -#include <asm/arch/periph.h> +#include <asm/arch-rockchip/periph.h> #include <dm/pinctrl.h> static int rockchip_sound_setup (struct udevice *dev)
drivers/spi/rk_spi.c +2 -2
@@ -16,8 +16,8 @@#include <spi.h> #include <linux/errno.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/periph.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/periph.h> #include <dm/pinctrl.h> #include "rk_spi.h"
drivers/sysreset/sysreset_rockchip.c +3 -3
@@ -8,9 +8,9 @@#include <errno.h> #include <sysreset.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3328.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3328.h> +#include <asm/arch-rockchip/hardware.h> #include <linux/err.h> int rockchip_sysreset_request (struct udevice *dev,enum sysreset_t type)
drivers/timer/rockchip_timer.c +1 -1
@@ -7,7 +7,7 @@#include <dm.h> #include <dm/ofnode.h> #include <mapmem.h> -#include <asm/arch/timer.h> +#include <asm/arch-rockchip/timer.h> #include <dt-structs.h> #include <timer.h> #include <asm/io.h>
drivers/usb/gadget/f_rockusb.c +1 -1
@@ -15,7 +15,7 @@#include <linux/compiler.h> #include <version.h> #include <g_dnl.h> -#include <asm/arch/f_rockusb.h> +#include <asm/arch-rockchip/f_rockusb.h> static inline struct f_rockusb *func_to_rockusb (struct usb_function *f) {
drivers/video/rockchip/rk3288_hdmi.c +3 -3
@@ -13,9 +13,9 @@#include <syscon.h> #include <asm/gpio.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/hardware.h> -#include <asm/arch/grf_rk3288.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/grf_rk3288.h> #include <power/regulator.h> #include "rk_hdmi.h"
drivers/video/rockchip/rk3288_mipi.c +5 -5
@@ -14,14 +14,14 @@#include "rk_mipi.h" #include <syscon.h> #include <asm/gpio.h> -#include <asm/hardware.h> #include <asm/io.h> #include <dm/uclass-internal.h> #include <linux/kernel.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3288.h> -#include <asm/arch/grf_rk3288.h> -#include <asm/arch/rockchip_mipi_dsi.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3288.h> +#include <asm/arch-rockchip/grf_rk3288.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/rockchip_mipi_dsi.h> #define MHz 1000000
drivers/video/rockchip/rk3288_vop.c +3 -3
@@ -11,10 +11,10 @@#include <regmap.h> #include <syscon.h> #include <video.h> -#include <asm/hardware.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3288.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/grf_rk3288.h> +#include <asm/arch-rockchip/hardware.h> #include "rk_vop.h" DECLARE_GLOBAL_DATA_PTR ;
drivers/video/rockchip/rk3399_hdmi.c +3 -3
@@ -13,9 +13,9 @@#include <syscon.h> #include <asm/gpio.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/hardware.h> -#include <asm/arch/grf_rk3399.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/grf_rk3399.h> #include <power/regulator.h> #include "rk_hdmi.h"
drivers/video/rockchip/rk3399_mipi.c +5 -5
@@ -14,14 +14,14 @@#include "rk_mipi.h" #include <syscon.h> #include <asm/gpio.h> -#include <asm/hardware.h> #include <asm/io.h> #include <dm/uclass-internal.h> #include <linux/kernel.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3399.h> -#include <asm/arch/grf_rk3399.h> -#include <asm/arch/rockchip_mipi_dsi.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3399.h> +#include <asm/arch-rockchip/grf_rk3399.h> +#include <asm/arch-rockchip/hardware.h> +#include <asm/arch-rockchip/rockchip_mipi_dsi.h> /* Select mipi dsi source, big or little vop */ static int rk_mipi_dsi_source_select (struct udevice *dev)
drivers/video/rockchip/rk3399_vop.c +1 -1
@@ -10,7 +10,7 @@#include <dm.h> #include <regmap.h> #include <video.h> -#include <asm/hardware.h> +#include <asm/arch-rockchip/hardware.h> #include <asm/io.h> #include "rk_vop.h"
drivers/video/rockchip/rk_edp.c +3 -3
@@ -14,9 +14,9 @@#include <syscon.h> #include <asm/gpio.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/edp_rk3288.h> -#include <asm/arch/grf_rk3288.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/edp_rk3288.h> +#include <asm/arch-rockchip/grf_rk3288.h> #include <dt-bindings/clock/rk3288-cru.h> #define MAX_CR_LOOP 5
drivers/video/rockchip/rk_hdmi.c +2 -3
@@ -14,10 +14,9 @@#include <regmap.h> #include <syscon.h> #include <asm/gpio.h> -#include <asm/hardware.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/hardware.h> #include "rk_hdmi.h" #include "rk_vop.h" /* for rk_vop_probe_regulators */
drivers/video/rockchip/rk_lvds.c +3 -3
@@ -12,9 +12,9 @@#include <syscon.h> #include <asm/gpio.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/lvds_rk3288.h> -#include <asm/arch/grf_rk3288.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/lvds_rk3288.h> +#include <asm/arch-rockchip/grf_rk3288.h> #include <dt-bindings/clock/rk3288-cru.h> #include <dt-bindings/video/rk3288.h>
drivers/video/rockchip/rk_mipi.c +4 -5
@@ -14,14 +14,13 @@#include "rk_mipi.h" #include <syscon.h> #include <asm/gpio.h> -#include <asm/hardware.h> #include <asm/io.h> #include <dm/uclass-internal.h> #include <linux/kernel.h> -#include <asm/arch/clock.h> -#include <asm/arch/cru_rk3399.h> -#include <asm/arch/grf_rk3399.h> -#include <asm/arch/rockchip_mipi_dsi.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/cru_rk3399.h> +#include <asm/arch-rockchip/grf_rk3399.h> +#include <asm/arch-rockchip/rockchip_mipi_dsi.h> DECLARE_GLOBAL_DATA_PTR ;
drivers/video/rockchip/rk_vop.c +3 -4
@@ -13,11 +13,10 @@#include <syscon.h> #include <video.h> #include <asm/gpio.h> -#include <asm/hardware.h> #include <asm/io.h> -#include <asm/arch/clock.h> -#include <asm/arch/edp_rk3288.h> -#include <asm/arch/vop_rk3288.h> +#include <asm/arch-rockchip/clock.h> +#include <asm/arch-rockchip/edp_rk3288.h> +#include <asm/arch-rockchip/vop_rk3288.h> #include <dm/device-internal.h> #include <dm/uclass-internal.h> #include <power/regulator.h>
drivers/video/rockchip/rk_vop.h +1 -1
@@ -6,7 +6,7 @@ #ifndef __RK_VOP_H__ #define __RK_VOP_H__ -#include <asm/arch/vop_rk3288.h> +#include <asm/arch-rockchip/vop_rk3288.h> struct rk_vop_priv { void *grf;
include/configs/rk3036_common.h +1 -1
@@ -5,7 +5,7 @@#ifndef __CONFIG_RK3036_COMMON_H#define __CONFIG_RK3036_COMMON_H -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/hardware.h> #include "rockchip-common.h" #define CONFIG_SYS_MALLOC_LEN (32 << 20)
include/configs/rk3188_common.h +1 -1
@@ -8,7 +8,7 @@#define CONFIG_SYS_CACHELINE_SIZE 64 -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/hardware.h> #include "rockchip-common.h" #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
include/configs/rk322x_common.h +1 -1
@@ -5,7 +5,7 @@#ifndef __CONFIG_RK322X_COMMON_H#define __CONFIG_RK322X_COMMON_H -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/hardware.h> #include "rockchip-common.h" #define CONFIG_SKIP_LOWLEVEL_INIT
include/configs/rk3288_common.h +1 -1
@@ -6,7 +6,7 @@#ifndef __CONFIG_RK3288_COMMON_H#define __CONFIG_RK3288_COMMON_H -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/hardware.h> #include "rockchip-common.h" #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
include/configs/rk3368_common.h +1 -1
@@ -10,7 +10,7 @@#define CONFIG_SYS_CACHELINE_SIZE 64 -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/hardware.h> #include <linux/sizes.h> #define CONFIG_SYS_SDRAM_BASE 0
include/configs/rv1108_common.h +1 -1
@@ -5,7 +5,7 @@#ifndef __CONFIG_RV1108_COMMON_H#define __CONFIG_RV1108_COMMON_H -#include <asm/arch/hardware.h> +#include <asm/arch-rockchip/hardware.h> #include "rockchip-common.h" #define CONFIG_SYS_MALLOC_LEN (32 << 20)
Signature · 1 line
2.20.1
PATCH 2/3 rockchip: use 'arch-rockchip' as header file path
Hi Kever,
Quoted 3 lines · Kever Yang
Rockchip use 'arch-rockchip' instead of arch-$(SOC) as common header file path, so that we can get the correct path directly.
Can you give a few more details on the reason for this change? I cannot see the benefit?
Regards,
Simon
PATCH 2/3 rockchip: use 'arch-rockchip' as header file path【请注意,邮件由[email protected]代发】
Hi Simon,
Quoted 7 lines · Simon Glass
Hi Kever,
Quoted 2 lines · Kever Yang
Rockchip use 'arch-rockchip' instead of arch-$(SOC) as common header file path, so that we can get the correct path directly.
Can you give a few more details on the reason for this change? I cannot see the benefit?
1. 'rockchip' is not SOC name but vendor name, we'd better use correct name;
2. the build system will include $(SOC)-u-boot.dtsi automatically without modify
$(SOC).dtsi or $(board).dtsi, if the $(SOC) default to 'rockchip', we can't use
this feature.
Thanks,
- Kever
Quoted 3 lines
Regards,
Simon
PATCH 2/3 rockchip: use 'arch-rockchip' as header file path【请注意,邮件由[email protected]代发】
Hi Kever,
Quoted 13 lines · Kever Yang
Hi Simon,
Quoted 7 lines · Simon Glass
Hi Kever,
Quoted 2 lines · Kever Yang
Rockchip use 'arch-rockchip' instead of arch-$(SOC) as common header file path, so that we can get the correct path directly.
Can you give a few more details on the reason for this change? I cannot see the benefit?
Quoted 6 lines
1. 'rockchip' is not SOC name but vendor name, we'd better use correct name;
2. the build system will include $(SOC)-u-boot.dtsi automatically without modify$(SOC).dtsi or $(board).dtsi, if the $(SOC) default to 'rockchip',we can't use
this feature.
OK I see.
So far Rockchip has been designed so that a single U-Boot (proper) can support multiple SoCs, although in practice we don't use that ability. So I don't think it is a big problem to drop it.
Regards,
Simon
PATCH 2/3 rockchip: use 'arch-rockchip' as header file path【请注意,邮件由[email protected]代发】
Hi Simon,
Quoted 20 lines · Simon Glass
Hi Kever,
Quoted 9 lines · Kever Yang
Hi Simon,
Quoted 5 lines · Simon Glass
Hi Kever,
Quoted 2 lines · Kever Yang
Rockchip use 'arch-rockchip' instead of arch-$(SOC) as common header file path, so that we can get the correct path directly.
Quoted 8 lines
Quoted 2 lines
Can you give a few more details on the reason for this change? I cannot see the benefit?
1. 'rockchip' is not SOC name but vendor name, we'd better use correct name;
2. the build system will include $(SOC)-u-boot.dtsi automatically without modify$(SOC).dtsi or $(board).dtsi, if the $(SOC) default to 'rockchip',we can't use
this feature.
Quoted 4 lines
OK I see.
So far Rockchip has been designed so that a single U-Boot (proper) can support multiple SoCs,
I don't understand, how can a single U-Boot(proper) support multiple Rockchip SoCs,
it sounds awesome which is kernel like. But I thought we need different build
with different source for different SoCs now.
For $(SOC)-u-boot.dtsi, another way is using $(BOARD)-u-boot.dtsi, but I think in
most case, we can have one $(SOC)-u-boot.dtsi instead of many $(BOARD)-u-boot.dtsi
for one SoC, so we need this feature.
Thinks,
- Kever
Quoted 6 lines
although in practice we don't use that ability.
So I don't think it is a big problem to drop it.Regards,
Simon
PATCH 2/3 rockchip: use 'arch-rockchip' as header file path【请注意,邮件由[email protected]代发】
Hi Kever,
Quoted 27 lines · Kever Yang
Hi Simon,
Quoted 22 lines · Simon Glass
Hi Kever,
Quoted 9 lines · Kever Yang
Hi Simon,
Quoted 5 lines · Simon Glass
Hi Kever,
Quoted 2 lines · Kever Yang
Rockchip use 'arch-rockchip' instead of arch-$(SOC) as common header file path, so that we can get the correct path directly.
Quoted 8 lines
Quoted 2 lines
Can you give a few more details on the reason for this change? I cannot see the benefit?
1. 'rockchip' is not SOC name but vendor name, we'd better use correct name;
2. the build system will include $(SOC)-u-boot.dtsi automatically without modify$(SOC).dtsi or $(board).dtsi, if the $(SOC) default to 'rockchip',we can't use
this feature.OK I see.
Quoted 8 lines
Quoted 2 lines
So far Rockchip has been designed so that a single U-Boot (proper) can support multiple SoCs,
I don't understand, how can a single U-Boot(proper) support multiple Rockchip SoCs,
it sounds awesome which is kernel like. But I thought we need different build
with different source for different SoCs now.
It should be possible simply by enabling multiple SoCs, so long as you don't try to use both 32/64-bit ones.
I suspect some extra work is needed, but probably not much.
Quoted 6 lines
For $(SOC)-u-boot.dtsi, another way is using $(BOARD)-u-boot.dtsi, but I think in
most case, we can have one $(SOC)-u-boot.dtsi instead of many $(BOARD)-u-boot.dtsi
for one SoC, so we need this feature.
Well we can add multiple device-tree files. Each board has its own. Then at runtime (in SPL) we select the correct one.
Regards,
Simon
PATCH 2/3 rockchip: use 'arch-rockchip' as header file path【请注意,邮件由[email protected]代发】
Quoted 36 lines · Simon Glass
Hi Kever,
Quoted 26 lines · Kever Yang
Hi Simon,
Quoted 22 lines · Simon Glass
Hi Kever,
Quoted 9 lines · Kever Yang
Hi Simon,
Quoted 5 lines · Simon Glass
Hi Kever,
Quoted 2 lines · Kever Yang
Rockchip use 'arch-rockchip' instead of arch-$(SOC) as common header file path, so that we can get the correct path directly.
Quoted 8 lines
Quoted 2 lines
Can you give a few more details on the reason for this change? I cannot see the benefit?
1. 'rockchip' is not SOC name but vendor name, we'd better use correct name;
2. the build system will include $(SOC)-u-boot.dtsi automatically without modify$(SOC).dtsi or $(board).dtsi, if the $(SOC) default to 'rockchip',we can't use
this feature.OK I see.
Quoted 7 lines
Quoted 2 lines
So far Rockchip has been designed so that a single U-Boot (proper) can support multiple SoCs,
I don't understand, how can a single U-Boot(proper) support multiple Rockchip SoCs,
it sounds awesome which is kernel like. But I thought we need different build
with different source for different SoCs now.
Quoted 4 lines
It should be possible simply by enabling multiple SoCs, so long as you don't try to use both 32/64-bit ones.
I suspect some extra work is needed, but probably not much.
multiple SoCs + multiple boards, I know it sounds very good and we may able to implement it, but it would be a long time. Kernel already do this, but we have
to know that it leaves all the one time program init job to U-Boot like loader and
load/fix a correct dtb for it.
Can we have more common codes first, my patches for common 'board/spl/tpl' has pending for more than one year, and I split it into pieces and hope to get
some of then merged in next merge window.
I know there may be change request needed, so I really want to get patches review
and response a little faster so that I can update a new version.
Well, this patch get reviewed pretty fast, but others seems no one sees them.
Thanks,
- Kever
Quoted 12 lines
Quoted 6 lines
For $(SOC)-u-boot.dtsi, another way is using $(BOARD)-u-boot.dtsi, but I think in
most case, we can have one $(SOC)-u-boot.dtsi instead of many $(BOARD)-u-boot.dtsi
for one SoC, so we need this feature.Well we can add multiple device-tree files. Each board has its own. Then at runtime (in SPL) we select the correct one.
Regards,
Simon
PATCH 2/3 rockchip: use 'arch-rockchip' as header file path【请注意,邮件由[email protected]代发】
Hi Kever,
Quoted 57 lines · Kever Yang
Quoted 36 lines · Simon Glass
Hi Kever,
Quoted 26 lines · Kever Yang
Hi Simon,
Quoted 22 lines · Simon Glass
Hi Kever,
Quoted 9 lines · Kever Yang
Hi Simon,
Quoted 5 lines · Simon Glass
Hi Kever,
Quoted 2 lines · Kever Yang
Rockchip use 'arch-rockchip' instead of arch-$(SOC) as common header file path, so that we can get the correct path directly.
Quoted 8 lines
Quoted 2 lines
Can you give a few more details on the reason for this change? I cannot see the benefit?
1. 'rockchip' is not SOC name but vendor name, we'd better use correct name;
2. the build system will include $(SOC)-u-boot.dtsi automatically without modify$(SOC).dtsi or $(board).dtsi, if the $(SOC) default to 'rockchip',we can't use
this feature.OK I see.
Quoted 7 lines
Quoted 2 lines
So far Rockchip has been designed so that a single U-Boot (proper) can support multiple SoCs,
I don't understand, how can a single U-Boot(proper) support multiple Rockchip SoCs,
it sounds awesome which is kernel like. But I thought we need different build
with different source for different SoCs now.Quoted 4 lines
It should be possible simply by enabling multiple SoCs, so long as you don't try to use both 32/64-bit ones.
I suspect some extra work is needed, but probably not much.
multiple SoCs + multiple boards, I know it sounds very good and we may able to implement it, but it would be a long time. Kernel already do this, but we have
to know that it leaves all the one time program init job to U-Boot like loader and
load/fix a correct dtb for it.Can we have more common codes first, my patches for common 'board/spl/tpl' has pending for more than one year, and I split it into pieces and hope to get
some of then merged in next merge window.
Quoted 6 lines
I know there may be change request needed, so I really want to get patches review
and response a little faster so that I can update a new version.Well, this patch get reviewed pretty fast, but others seems no one sees them.
OK hopefully these can all be applied soon, perhaps in a -next branch.
Regards,
Simon
PATCH 2/3 rockchip: use 'arch-rockchip' as header file path
In reply to Simon GlassHi Kever,
Quoted 10 lines · Simon Glass
Hi Kever,
Quoted 3 lines · Kever Yang
Rockchip use 'arch-rockchip' instead of arch-$(SOC) as common header file path, so that we can get the correct path directly.
Can you give a few more details on the reason for this change? I cannot see the benefit?
OK I figured it out from the context.
Do you have interest in supporting multiple SoCs with a single build?
Regards,
Simon
PATCH 2/3 rockchip: use 'arch-rockchip' as header file path【请注意,邮件由[email protected]代发】
Hi Simon,
Quoted 5 lines · Simon Glass
Hi Kever,
Quoted 2 lines · Simon Glass
Hi Kever,
Quoted 8 lines
Quoted 5 lines · Kever Yang
Quoted 2 lines
Rockchip use 'arch-rockchip' instead of arch-$(SOC) as common header file path, so that we can get the correct path directly.
Can you give a few more details on the reason for this change? I cannot see the benefit?
OK I figured it out from the context.
Do you have interest in supporting multiple SoCs with a single build?
Is there other vendor support multiple SoCs?
For Rockchip platform, I don't think it's easy to do it now, the different for different SoCs now:
- SoC init, eg. debug uart init, sgrf setting and other one time init setting;
- clock driver;
- pinctrl driver, David still working on it, but the target is for minimum size for
each SoC, but not enable common code in pinctrl-core as much as possible, so this is the opposite way with support multiple SoCs support.
I would like to use common board/spl/tpl files first, and then step to step to
see what we need to do.
Thanks,
- Kever
Quoted 3 lines
Regards,
Simon
PATCH 2/3 rockchip: use 'arch-rockchip' as header file path【请注意,邮件由[email protected]代发】
Hi Kever,
Quoted 30 lines · Kever Yang
Hi Simon,
Quoted 5 lines · Simon Glass
Hi Kever,
Quoted 2 lines · Simon Glass
Hi Kever,
Quoted 8 lines
Quoted 5 lines · Kever Yang
Quoted 2 lines
Rockchip use 'arch-rockchip' instead of arch-$(SOC) as common header file path, so that we can get the correct path directly.
Can you give a few more details on the reason for this change? I cannot see the benefit?
OK I figured it out from the context.
Do you have interest in supporting multiple SoCs with a single build?
Is there other vendor support multiple SoCs?
For Rockchip platform, I don't think it's easy to do it now, the different for different SoCs now:
- SoC init, eg. debug uart init, sgrf setting and other one time init setting;
- clock driver;
- pinctrl driver, David still working on it, but the target is for minimum size for
each SoC, but not enable common code in pinctrl-core as much as possible, so this is the opposite way with support multiple SoCs support.
Quoted 3 lines
I would like to use common board/spl/tpl files first, and then step to step to
see what we need to do.
OK. We can today support multiple clock and pinctrl drivers. Minimising code size is a separate issue to actually making it work.
For SoC init we can use compatible strings to select the init - as you say, moving to common SPL/TPL is a useful step, but in fact this is not necessary for use to use a common U-Boot proper. I believe the main requirement is to create a new config with additional drivers, then make SPL select the correct DT.
But my concern is that your series to move things to #include asm/arch precludes supporting more than one SoC. So if we want this, we should leave things as they are.
If you like I could create a proof of concept for this for two chosen SoCs?
Regards,
Simon
PATCH 2/3 rockchip: use 'arch-rockchip' as header file path
In reply to Kever YangQuoted 99 lines
Rockchip use 'arch-rockchip' instead of arch-$(SOC) as common header file path, so that we can get the correct path directly.
Signed-off-by Kever Yang <[email protected]>---
.../include/asm/arch-rockchip/ddr_rk3188.h | 2 +- arch/arm/mach-rockchip/Kconfig | 2 +- arch/arm/mach-rockchip/boot_mode.c | 2 +- arch/arm/mach-rockchip/bootrom.c | 4 ++-- arch/arm/mach-rockchip/rk3036-board-spl.c | 12 +++++------ arch/arm/mach-rockchip/rk3036-board.c | 10 +++++----- arch/arm/mach-rockchip/rk3036/clk_rk3036.c | 4 ++-- arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | 12 +++++------ arch/arm/mach-rockchip/rk3036/syscon_rk3036.c | 2 +- arch/arm/mach-rockchip/rk3128-board.c | 10 +++++----- arch/arm/mach-rockchip/rk3128/clk_rk3128.c | 4 ++-- arch/arm/mach-rockchip/rk3128/syscon_rk3128.c | 2 +- arch/arm/mach-rockchip/rk3188-board-spl.c | 16 +++++++-------- arch/arm/mach-rockchip/rk3188-board.c | 10 +++++----- arch/arm/mach-rockchip/rk3188/clk_rk3188.c | 4 ++-- arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 2 +- arch/arm/mach-rockchip/rk322x-board-spl.c | 12 +++++------ arch/arm/mach-rockchip/rk322x-board.c | 10 +++++----- arch/arm/mach-rockchip/rk322x/clk_rk322x.c | 4 ++-- arch/arm/mach-rockchip/rk322x/syscon_rk322x.c | 2 +- arch/arm/mach-rockchip/rk3288-board-spl.c | 20 +++++++++---------- arch/arm/mach-rockchip/rk3288-board-tpl.c | 14 ++++++------- arch/arm/mach-rockchip/rk3288-board.c | 12 +++++------ arch/arm/mach-rockchip/rk3288/clk_rk3288.c | 4 ++-- arch/arm/mach-rockchip/rk3288/rk3288.c | 2 +- arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 2 +- arch/arm/mach-rockchip/rk3328/clk_rk3328.c | 4 ++-- arch/arm/mach-rockchip/rk3328/rk3328.c | 2 +- arch/arm/mach-rockchip/rk3328/syscon_rk3328.c | 2 +- arch/arm/mach-rockchip/rk3368-board-spl.c | 10 +++++----- arch/arm/mach-rockchip/rk3368-board-tpl.c | 12 +++++------ arch/arm/mach-rockchip/rk3368/clk_rk3368.c | 4 ++-- arch/arm/mach-rockchip/rk3368/rk3368.c | 6 +++--- arch/arm/mach-rockchip/rk3368/syscon_rk3368.c | 2 +- arch/arm/mach-rockchip/rk3399-board-spl.c | 12 +++++------ arch/arm/mach-rockchip/rk3399-board.c | 2 +- arch/arm/mach-rockchip/rk3399/clk_rk3399.c | 4 ++-- arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +- arch/arm/mach-rockchip/rk3399/syscon_rk3399.c | 2 +- arch/arm/mach-rockchip/rk_timer.c | 2 +- arch/arm/mach-rockchip/rv1108/clk_rv1108.c | 4 ++-- arch/arm/mach-rockchip/rv1108/syscon_rv1108.c | 2 +- arch/arm/mach-rockchip/sdram_common.c | 2 +- board/elgin/elgin_rv1108/elgin_rv1108.c | 4 ++-- board/rockchip/evb_rk3036/evb_rk3036.c | 4 ++-- board/rockchip/evb_rk3229/evb_rk3229.c | 2 +- board/rockchip/evb_rk3399/evb-rk3399.c | 2 +- board/rockchip/evb_rv1108/evb_rv1108.c | 4 ++-- board/rockchip/kylin_rk3036/kylin_rk3036.c | 4 ++-- board/rockchip/sheep_rk3368/sheep_rk3368.c | 4 ++-- .../lion_rk3368/lion_rk3368.c | 6 +++--- .../puma_rk3399/puma-rk3399.c | 10 +++++----- board/vamrs/rock960_rk3399/rock960-rk3399.c | 2 +- cmd/rockusb.c | 2 +- drivers/clk/rockchip/clk_rk3036.c | 6 +++--- drivers/clk/rockchip/clk_rk3128.c | 6 +++--- drivers/clk/rockchip/clk_rk3188.c | 8 ++++---- drivers/clk/rockchip/clk_rk322x.c | 6 +++--- drivers/clk/rockchip/clk_rk3288.c | 8 ++++---- drivers/clk/rockchip/clk_rk3328.c | 8 ++++---- drivers/clk/rockchip/clk_rk3368.c | 6 +++--- drivers/clk/rockchip/clk_rk3399.c | 6 +++--- drivers/clk/rockchip/clk_rv1108.c | 6 +++--- drivers/gpio/rk_gpio.c | 3 ++- drivers/i2c/rk_i2c.c | 6 +++--- drivers/mmc/rockchip_dw_mmc.c | 4 ++-- drivers/net/gmac_rockchip.c | 18 ++++++++--------- drivers/pwm/rk_pwm.c | 2 +- drivers/ram/rockchip/dmc-rk3368.c | 12 +++++------ drivers/ram/rockchip/sdram_rk3128.c | 6 +++--- drivers/ram/rockchip/sdram_rk3188.c | 14 ++++++------- drivers/ram/rockchip/sdram_rk322x.c | 16 +++++++-------- drivers/ram/rockchip/sdram_rk3288.c | 14 ++++++------- drivers/ram/rockchip/sdram_rk3328.c | 6 +++--- drivers/ram/rockchip/sdram_rk3399.c | 12 +++++------ drivers/reset/reset-rockchip.c | 2 +- drivers/serial/serial_rockchip.c | 2 +- drivers/sound/rockchip_sound.c | 2 +- drivers/spi/rk_spi.c | 4 ++-- drivers/sysreset/sysreset_rockchip.c | 6 +++--- drivers/timer/rockchip_timer.c | 2 +- drivers/usb/gadget/f_rockusb.c | 2 +- drivers/video/rockchip/rk3288_hdmi.c | 6 +++--- drivers/video/rockchip/rk3288_mipi.c | 10 +++++----- drivers/video/rockchip/rk3288_vop.c | 6 +++--- drivers/video/rockchip/rk3399_hdmi.c | 6 +++--- drivers/video/rockchip/rk3399_mipi.c | 10 +++++----- drivers/video/rockchip/rk3399_vop.c | 2 +- drivers/video/rockchip/rk_edp.c | 6 +++--- drivers/video/rockchip/rk_hdmi.c | 5 ++--- drivers/video/rockchip/rk_lvds.c | 6 +++--- drivers/video/rockchip/rk_mipi.c | 9 ++++----- drivers/video/rockchip/rk_vop.c | 7 +++----
Quoted 9 lines
drivers/video/rockchip/rk_vop.h | 2 +- include/configs/rk3036_common.h | 2 +- include/configs/rk3188_common.h | 2 +- include/configs/rk322x_common.h | 2 +- include/configs/rk3288_common.h | 2 +- include/configs/rk3368_common.h | 2 +- include/configs/rv1108_common.h | 2 +- 100 files changed, 288 insertions(+), 290 deletions(-)
PATCH 2/3 rockchip: use 'arch-rockchip' as header file path
In reply to Kever YangQuoted 100 lines
Rockchip use 'arch-rockchip' instead of arch-$(SOC) as common header file path, so that we can get the correct path directly.
Signed-off-by Kever Yang <[email protected]>Reviewed-by Philipp Tomsich <[email protected]>---
.../include/asm/arch-rockchip/ddr_rk3188.h | 2 +- arch/arm/mach-rockchip/Kconfig | 2 +- arch/arm/mach-rockchip/boot_mode.c | 2 +- arch/arm/mach-rockchip/bootrom.c | 4 ++-- arch/arm/mach-rockchip/rk3036-board-spl.c | 12 +++++------ arch/arm/mach-rockchip/rk3036-board.c | 10 +++++----- arch/arm/mach-rockchip/rk3036/clk_rk3036.c | 4 ++-- arch/arm/mach-rockchip/rk3036/sdram_rk3036.c | 12 +++++------ arch/arm/mach-rockchip/rk3036/syscon_rk3036.c | 2 +- arch/arm/mach-rockchip/rk3128-board.c | 10 +++++----- arch/arm/mach-rockchip/rk3128/clk_rk3128.c | 4 ++-- arch/arm/mach-rockchip/rk3128/syscon_rk3128.c | 2 +- arch/arm/mach-rockchip/rk3188-board-spl.c | 16 +++++++-------- arch/arm/mach-rockchip/rk3188-board.c | 10 +++++----- arch/arm/mach-rockchip/rk3188/clk_rk3188.c | 4 ++-- arch/arm/mach-rockchip/rk3188/syscon_rk3188.c | 2 +- arch/arm/mach-rockchip/rk322x-board-spl.c | 12 +++++------ arch/arm/mach-rockchip/rk322x-board.c | 10 +++++----- arch/arm/mach-rockchip/rk322x/clk_rk322x.c | 4 ++-- arch/arm/mach-rockchip/rk322x/syscon_rk322x.c | 2 +- arch/arm/mach-rockchip/rk3288-board-spl.c | 20 +++++++++---------- arch/arm/mach-rockchip/rk3288-board-tpl.c | 14 ++++++------- arch/arm/mach-rockchip/rk3288-board.c | 12 +++++------ arch/arm/mach-rockchip/rk3288/clk_rk3288.c | 4 ++-- arch/arm/mach-rockchip/rk3288/rk3288.c | 2 +- arch/arm/mach-rockchip/rk3288/syscon_rk3288.c | 2 +- arch/arm/mach-rockchip/rk3328/clk_rk3328.c | 4 ++-- arch/arm/mach-rockchip/rk3328/rk3328.c | 2 +- arch/arm/mach-rockchip/rk3328/syscon_rk3328.c | 2 +- arch/arm/mach-rockchip/rk3368-board-spl.c | 10 +++++----- arch/arm/mach-rockchip/rk3368-board-tpl.c | 12 +++++------ arch/arm/mach-rockchip/rk3368/clk_rk3368.c | 4 ++-- arch/arm/mach-rockchip/rk3368/rk3368.c | 6 +++--- arch/arm/mach-rockchip/rk3368/syscon_rk3368.c | 2 +- arch/arm/mach-rockchip/rk3399-board-spl.c | 12 +++++------ arch/arm/mach-rockchip/rk3399-board.c | 2 +- arch/arm/mach-rockchip/rk3399/clk_rk3399.c | 4 ++-- arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +- arch/arm/mach-rockchip/rk3399/syscon_rk3399.c | 2 +- arch/arm/mach-rockchip/rk_timer.c | 2 +- arch/arm/mach-rockchip/rv1108/clk_rv1108.c | 4 ++-- arch/arm/mach-rockchip/rv1108/syscon_rv1108.c | 2 +- arch/arm/mach-rockchip/sdram_common.c | 2 +- board/elgin/elgin_rv1108/elgin_rv1108.c | 4 ++-- board/rockchip/evb_rk3036/evb_rk3036.c | 4 ++-- board/rockchip/evb_rk3229/evb_rk3229.c | 2 +- board/rockchip/evb_rk3399/evb-rk3399.c | 2 +- board/rockchip/evb_rv1108/evb_rv1108.c | 4 ++-- board/rockchip/kylin_rk3036/kylin_rk3036.c | 4 ++-- board/rockchip/sheep_rk3368/sheep_rk3368.c | 4 ++-- .../lion_rk3368/lion_rk3368.c | 6 +++--- .../puma_rk3399/puma-rk3399.c | 10 +++++----- board/vamrs/rock960_rk3399/rock960-rk3399.c | 2 +- cmd/rockusb.c | 2 +- drivers/clk/rockchip/clk_rk3036.c | 6 +++--- drivers/clk/rockchip/clk_rk3128.c | 6 +++--- drivers/clk/rockchip/clk_rk3188.c | 8 ++++---- drivers/clk/rockchip/clk_rk322x.c | 6 +++--- drivers/clk/rockchip/clk_rk3288.c | 8 ++++---- drivers/clk/rockchip/clk_rk3328.c | 8 ++++---- drivers/clk/rockchip/clk_rk3368.c | 6 +++--- drivers/clk/rockchip/clk_rk3399.c | 6 +++--- drivers/clk/rockchip/clk_rv1108.c | 6 +++--- drivers/gpio/rk_gpio.c | 3 ++- drivers/i2c/rk_i2c.c | 6 +++--- drivers/mmc/rockchip_dw_mmc.c | 4 ++-- drivers/net/gmac_rockchip.c | 18 ++++++++--------- drivers/pwm/rk_pwm.c | 2 +- drivers/ram/rockchip/dmc-rk3368.c | 12 +++++------ drivers/ram/rockchip/sdram_rk3128.c | 6 +++--- drivers/ram/rockchip/sdram_rk3188.c | 14 ++++++------- drivers/ram/rockchip/sdram_rk322x.c | 16 +++++++-------- drivers/ram/rockchip/sdram_rk3288.c | 14 ++++++------- drivers/ram/rockchip/sdram_rk3328.c | 6 +++--- drivers/ram/rockchip/sdram_rk3399.c | 12 +++++------ drivers/reset/reset-rockchip.c | 2 +- drivers/serial/serial_rockchip.c | 2 +- drivers/sound/rockchip_sound.c | 2 +- drivers/spi/rk_spi.c | 4 ++-- drivers/sysreset/sysreset_rockchip.c | 6 +++--- drivers/timer/rockchip_timer.c | 2 +- drivers/usb/gadget/f_rockusb.c | 2 +- drivers/video/rockchip/rk3288_hdmi.c | 6 +++--- drivers/video/rockchip/rk3288_mipi.c | 10 +++++----- drivers/video/rockchip/rk3288_vop.c | 6 +++--- drivers/video/rockchip/rk3399_hdmi.c | 6 +++--- drivers/video/rockchip/rk3399_mipi.c | 10 +++++----- drivers/video/rockchip/rk3399_vop.c | 2 +- drivers/video/rockchip/rk_edp.c | 6 +++--- drivers/video/rockchip/rk_hdmi.c | 5 ++--- drivers/video/rockchip/rk_lvds.c | 6 +++--- drivers/video/rockchip/rk_mipi.c | 9 ++++----- drivers/video/rockchip/rk_vop.c | 7 +++----
Quoted 9 lines
drivers/video/rockchip/rk_vop.h | 2 +- include/configs/rk3036_common.h | 2 +- include/configs/rk3188_common.h | 2 +- include/configs/rk322x_common.h | 2 +- include/configs/rk3288_common.h | 2 +- include/configs/rk3368_common.h | 2 +- include/configs/rv1108_common.h | 2 +- 100 files changed, 288 insertions(+), 290 deletions(-)
Applied to u-boot-rockchip, thanks!
PATCH 3/3 rockchip: correct ARCH_SOC name
In reply to Kever YangThe ARCH_SOC name default as 'rockchip' and we put all the header file in 'arch/arm/include/asm/arch-rockchip/', but the 'rockchip' is not the SOC name, let's correct it after we update all the source file.
---
arch/arm/mach-rockchip/rk3036/Kconfig | 2 +- arch/arm/mach-rockchip/rk3128/Kconfig | 2 +- arch/arm/mach-rockchip/rk3188/Kconfig | 2 +- arch/arm/mach-rockchip/rk322x/Kconfig | 2 +- arch/arm/mach-rockchip/rk3288/Kconfig | 2 +- arch/arm/mach-rockchip/rk3328/Kconfig | 2 +- arch/arm/mach-rockchip/rk3368/Kconfig | 2 +- arch/arm/mach-rockchip/rk3399/Kconfig | 2 +- arch/arm/mach-rockchip/rv1108/Kconfig | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/mach-rockchip/rk3036/Kconfig +1 -1
@@ -9,7 +9,7 @@ config TARGET_KYLIN_RK3036 select BOARD_LATE_INIT config SYS_SOC - default "rockchip" + default "rk3036" config SYS_MALLOC_F_LEN default 0x400
arch/arm/mach-rockchip/rk3128/Kconfig +1 -1
@@ -14,7 +14,7 @@ config TARGET_EVB_RK3128 endchoice config SYS_SOC - default "rockchip" + default "rk3128" config SYS_MALLOC_F_LEN default 0x0800
arch/arm/mach-rockchip/rk3188/Kconfig +1 -1
@@ -10,7 +10,7 @@ config TARGET_ROCK UART and GPIOs. config SYS_SOC - default "rockchip" + default "rk3188" config SYS_MALLOC_F_LEN default 0x0800
arch/arm/mach-rockchip/rk322x/Kconfig +1 -1
@@ -5,7 +5,7 @@ config TARGET_EVB_RK3229 select BOARD_LATE_INIT config SYS_SOC - default "rockchip" + default "rk322x" config SYS_MALLOC_F_LEN default 0x400
arch/arm/mach-rockchip/rk3288/Kconfig +1 -1
@@ -148,7 +148,7 @@ config ROCKCHIP_FAST_SPL and have the required PMIC code. config SYS_SOC - default "rockchip" + default "rk3288" config SYS_MALLOC_F_LEN default 0x0800
arch/arm/mach-rockchip/rk3328/Kconfig +1 -1
@@ -13,7 +13,7 @@ config TARGET_EVB_RK3328 endchoice config SYS_SOC - default "rockchip" + default "rk3328" config SYS_MALLOC_F_LEN default 0x0800
arch/arm/mach-rockchip/rk3368/Kconfig +1 -1
@@ -43,7 +43,7 @@ config TARGET_EVB_PX5 endchoice config SYS_SOC - default "rockchip" + default "rk3368" source "board/theobroma-systems/lion_rk3368/Kconfig" source "board/rockchip/sheep_rk3368/Kconfig"
arch/arm/mach-rockchip/rk3399/Kconfig +1 -1
@@ -65,7 +65,7 @@ config TARGET_CHROMEBOOK_BOB endchoice config SYS_SOC - default "rockchip" + default "rk3399" config SYS_MALLOC_F_LEN default 0x0800
arch/arm/mach-rockchip/rv1108/Kconfig +1 -1
@@ -23,7 +23,7 @@ config TARGET_ELGIN_RV1108 RV1108 ELGIN is a board based on the Rockchip RV1108. config SYS_SOC - default "rockchip" + default "rv1108" config SYS_MALLOC_F_LEN default 0x400
Signature · 1 line
2.20.1
PATCH 3/3 rockchip: correct ARCH_SOC name
Quoted 10 lines · Kever Yang
The
ARCH_SOCname default as 'rockchip' and we put all the header file in 'arch/arm/include/asm/arch-rockchip/', but the 'rockchip' is not the SOC name, let's correct it after we update all the source file.Signed-off-by Kever Yang <[email protected]>
Just a style question: most of the documentation refers to the chips as RK3… while this has them as rk3… (i.e. the differenc eis whether the RK is lower- or upper-case); is this difference intentional?
Thanks,
Phil.
PATCH 3/3 rockchip: correct ARCH_SOC name
Hi Philipp,
Quoted 8 lines · Philipp Tomsich
Quoted 8 lines · Kever Yang
The
ARCH_SOCname default as 'rockchip' and we put all the header file in 'arch/arm/include/asm/arch-rockchip/', but the 'rockchip' is not the SOC name, let's correct it after we update all the source file.
Quoted 6 lines
Quoted 1 line
Signed-off-by Kever Yang <[email protected]>Reviewed-by Philipp Tomsiich <[email protected]>Just a style question: most of the documentation refers to the chips as RK3… while this has them as rk3… (i.e. the differenc eis whether the RK is lower- or upper-case); is this difference intentional?
This soc name will use to mach rk3...dtsi in source code, and all the dtsi files are using lower-case.
Thanks,
- Kever
Quoted 3 lines
Thanks,
Phil.
PATCH 3/3 rockchip: correct ARCH_SOC name
In reply to Kever YangQuoted 9 lines
The
ARCH_SOCname default as 'rockchip' and we put all the header file in 'arch/arm/include/asm/arch-rockchip/', but the 'rockchip' is not the SOC name, let's correct it after we update all the source file.Signed-off-by Kever Yang <[email protected]>Reviewed-by Philipp Tomsiich <[email protected]>---
Quoted 11 lines
arch/arm/mach-rockchip/rk3036/Kconfig | 2 +- arch/arm/mach-rockchip/rk3128/Kconfig | 2 +- arch/arm/mach-rockchip/rk3188/Kconfig | 2 +- arch/arm/mach-rockchip/rk322x/Kconfig | 2 +- arch/arm/mach-rockchip/rk3288/Kconfig | 2 +- arch/arm/mach-rockchip/rk3328/Kconfig | 2 +- arch/arm/mach-rockchip/rk3368/Kconfig | 2 +- arch/arm/mach-rockchip/rk3399/Kconfig | 2 +- arch/arm/mach-rockchip/rv1108/Kconfig | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
Applied to u-boot-rockchip, thanks!