rockchip: use OF_UPSTREAM for rk3036
Subsystems (5)
PATCH v2 1/1 rockchip: use OF_UPSTREAM for rk3036
The device tree for rk3036 combined is now available in the /dts/upstream directory. Use imply OF_UPSTREAM to migrate all rk3036 boards.
Reviewed-by Kever Yang <[email protected]>
Signed-off-by Johan Jonker <[email protected]>
---
Apply after due to Makefile changes:
[PATCH v2] rockchip: use OF_UPSTREAM for rk3066a/rk3188
https://lore.kernel.org/u-boot/[email protected]/
Changed V2:
Keep MAINTAINERS is as-is
---
SPL/TPL output status is unknown with current defconfig
---
arch/arm/dts/Makefile | 3 -
...sdk-u-boot.dtsi => rk3036-evb-u-boot.dtsi} | 6 +-
arch/arm/dts/rk3036-kylin-u-boot.dtsi | 13 +
arch/arm/dts/rk3036-sdk.dts | 74 ---
arch/arm/dts/rk3036.dtsi | 439 ------------------
arch/arm/mach-rockchip/Kconfig | 1 +
configs/evb-rk3036_defconfig | 4 +-
configs/kylin-rk3036_defconfig | 4 +-
include/dt-bindings/clock/rk3036-cru.h | 185 --------
9 files changed, 21 insertions(+), 708 deletions(-)
rename arch/arm/dts/{rk3036-sdk-u-boot.dtsi => rk3036-evb-u-boot.dtsi} (100%)
create mode 100644 arch/arm/dts/rk3036-kylin-u-boot.dtsi
delete mode 100644 arch/arm/dts/rk3036-sdk.dts
delete mode 100644 arch/arm/dts/rk3036.dtsi
delete mode 100644 include/dt-bindings/clock/rk3036-cru.harch/arm/dts/Makefile +0 -3
@@ -52,9 +52,6 @@ dtb-$(CONFIG_MACH_S900) += \ dtb-$(CONFIG_MACH_S700) += \ s700-cubieboard7.dtb -dtb-$(CONFIG_ROCKCHIP_RK3036) += \ - rk3036-sdk.dtb - dtb-$(CONFIG_ROCKCHIP_RK3128) += \ rk3128-evb.dtb
arch/arm/dts/rk3036-evb-u-boot.dtsi renamed from arch/arm/dts/rk3036-sdk-u-boot.dtsi +3 -3
@@ -1,13 +1,13 @@ #include "rk3036-u-boot.dtsi" -&uart2 { +&grf { bootph-all; }; -&grf { +&pinctrl { bootph-all; }; -&pinctrl { +&uart2 { bootph-all; };
arch/arm/dts/rk3036-kylin-u-boot.dtsi new file +13 -0
@@ -0,0 +1,13 @@ +#include "rk3036-u-boot.dtsi" + +&grf { + bootph-all; +}; + +&pinctrl { + bootph-all; +}; + +&uart2 { + bootph-all; +};
arch/arm/dts/rk3036-sdk.dts deleted +0 -74
74 lines not on this page · raw message
arch/arm/dts/rk3036.dtsi deleted +0 -439
439 lines not on this page · raw message
arch/arm/mach-rockchip/Kconfig +1 -0
@@ -29,6 +29,7 @@ config ROCKCHIP_RK3036 select CPU_V7A select SUPPORT_SPL select SPL + imply OF_UPSTREAM imply USB_FUNCTION_ROCKUSB imply CMD_ROCKUSB imply ROCKCHIP_COMMON_BOARD
configs/evb-rk3036_defconfig +2 -2
@@ -11,7 +11,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x60100000 CONFIG_SF_DEFAULT_SPEED=20000000 -CONFIG_DEFAULT_DEVICE_TREE="rk3036-sdk" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3036-evb" CONFIG_ROCKCHIP_RK3036=y CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_SPL_STACK=0x10081fff
@@ -23,7 +23,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_USE_PREBOOT=y -CONFIG_DEFAULT_FDT_FILE="rk3036-evb.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3036-evb.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_FRAMEWORK is not set
configs/kylin-rk3036_defconfig +2 -2
@@ -12,7 +12,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x60100000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3036-sdk" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3036-kylin" CONFIG_ROCKCHIP_RK3036=y CONFIG_TARGET_KYLIN_RK3036=y CONFIG_SPL_STACK_R_ADDR=0x80000
@@ -25,7 +25,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_USE_PREBOOT=y -CONFIG_DEFAULT_FDT_FILE="rk3036-kylin.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3036-kylin.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_FRAMEWORK is not set
include/dt-bindings/clock/rk3036-cru.h deleted +0 -185
185 lines not on this page · raw message
--
2.39.5