rockchip: Switch remaining boards to upstream devicetree
Subsystems (5)
cover rockchip: Switch remaining boards to upstream devicetree
Switch remaining boards to upstream devicetree. Remove rk3368-sheep board due to lack of upstream support.
Johan Jonker (3):
rockchip: Switch rk3128 boards to upstream devicetree
rockchip: Switch rk3229 boards to upstream devicetree
rockchip: Switch rk3368 boards to upstream devicetree
arch/arm/dts/Makefile | 11 - arch/arm/dts/rk3128-evb.dts | 99 -- arch/arm/dts/rk3128.dtsi | 780 --------------- arch/arm/dts/rk3229-evb.dts | 256 ----- arch/arm/dts/rk3229.dtsi | 52 - arch/arm/dts/rk3368-geekbox.dts | 281 ------ arch/arm/dts/rk3368-px5-evb.dts | 277 ------ arch/arm/dts/rk3368-sheep-u-boot.dtsi | 35 - arch/arm/dts/rk3368-sheep.dts | 286 ------ arch/arm/dts/rk3368-u-boot.dtsi | 4 + arch/arm/dts/rk3368.dtsi | 1218 ----------------------- arch/arm/mach-rockchip/Kconfig | 3 + arch/arm/mach-rockchip/rk3368/Kconfig | 7 - board/rockchip/evb_rk3229/MAINTAINERS | 1 - board/rockchip/sheep_rk3368/Kconfig | 12 - board/rockchip/sheep_rk3368/MAINTAINERS | 6 - board/rockchip/sheep_rk3368/README | 44 - configs/evb-px5_defconfig | 2 +- configs/evb-rk3128_defconfig | 4 +- configs/evb-rk3229_defconfig | 4 +- configs/geekbox_defconfig | 2 +- configs/sheep-rk3368_defconfig | 32 - doc/board/rockchip/rockchip.rst | 1 - include/configs/sheep_rk3368.h | 15 - include/dt-bindings/clock/rk3128-cru.h | 273 ----- include/dt-bindings/clock/rk3228-cru.h | 287 ------ 26 files changed, 13 insertions(+), 3979 deletions(-) delete mode 100644 arch/arm/dts/rk3128-evb.dts delete mode 100644 arch/arm/dts/rk3128.dtsi delete mode 100644 arch/arm/dts/rk3229-evb.dts delete mode 100644 arch/arm/dts/rk3229.dtsi delete mode 100644 arch/arm/dts/rk3368-geekbox.dts delete mode 100644 arch/arm/dts/rk3368-px5-evb.dts delete mode 100644 arch/arm/dts/rk3368-sheep-u-boot.dtsi delete mode 100644 arch/arm/dts/rk3368-sheep.dts delete mode 100644 arch/arm/dts/rk3368.dtsi delete mode 100644 board/rockchip/sheep_rk3368/Kconfig delete mode 100644 board/rockchip/sheep_rk3368/MAINTAINERS delete mode 100644 board/rockchip/sheep_rk3368/README delete mode 100644 configs/sheep-rk3368_defconfig delete mode 100644 include/configs/sheep_rk3368.h delete mode 100644 include/dt-bindings/clock/rk3128-cru.h delete mode 100644 include/dt-bindings/clock/rk3228-cru.h
--
2.39.5
PATCH 1/3 rockchip: Switch rk3128 boards to upstream devicetree
Switch rk3128 boards to upstream devicetree.
--- arch/arm/dts/Makefile | 3 - arch/arm/dts/rk3128-evb.dts | 99 ---- arch/arm/dts/rk3128.dtsi | 780 ------------------------- arch/arm/mach-rockchip/Kconfig | 1 + configs/evb-rk3128_defconfig | 4 +- include/dt-bindings/clock/rk3128-cru.h | 273 --------- 6 files changed, 3 insertions(+), 1157 deletions(-) delete mode 100644 arch/arm/dts/rk3128-evb.dts delete mode 100644 arch/arm/dts/rk3128.dtsi delete mode 100644 include/dt-bindings/clock/rk3128-cru.h
arch/arm/dts/Makefile +0 -3
@@ -52,9 +52,6 @@ dtb-$(CONFIG_MACH_S900) += \ dtb-$(CONFIG_MACH_S700) += \ s700-cubieboard7.dtb -dtb-$(CONFIG_ROCKCHIP_RK3128) += \ - rk3128-evb.dtb - dtb-$(CONFIG_ROCKCHIP_RK322X) += \ rk3229-evb.dtb
arch/arm/dts/rk3128-evb.dts deleted +0 -99
99 lines not on this page · raw message
arch/arm/dts/rk3128.dtsi deleted +0 -780
780 lines not on this page · raw message
arch/arm/mach-rockchip/Kconfig +1 -0
@@ -65,6 +65,7 @@ config ROCKCHIP_RK3066 config ROCKCHIP_RK3128 bool "Support Rockchip RK3128" select CPU_V7A + imply OF_UPSTREAM imply ROCKCHIP_COMMON_BOARD help The Rockchip RK3128 is a ARM-based SoC with a quad-core Cortex-A7
configs/evb-rk3128_defconfig +2 -2
@@ -8,7 +8,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x60100000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x0 -CONFIG_DEFAULT_DEVICE_TREE="rk3128-evb" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3128-evb" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3128=y CONFIG_SYS_BOOTM_LEN=0x4000000
@@ -18,7 +18,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000 # CONFIG_DEBUG_UART_BOARD_INIT is not set CONFIG_DEBUG_UART=y CONFIG_FIT=y -CONFIG_DEFAULT_FDT_FILE="rk3128-evb.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3128-evb.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GPT=y
include/dt-bindings/clock/rk3128-cru.h deleted +0 -273
273 lines not on this page · raw message
--
2.39.5
PATCH 2/3 rockchip: Switch rk3229 boards to upstream devicetree
In reply to Johan JonkerSwitch rk3229 boards to upstream devicetree.
--- arch/arm/dts/Makefile | 3 - arch/arm/dts/rk3229-evb.dts | 256 ---------------------- arch/arm/dts/rk3229.dtsi | 52 ----- arch/arm/mach-rockchip/Kconfig | 1 + board/rockchip/evb_rk3229/MAINTAINERS | 1 - configs/evb-rk3229_defconfig | 4 +- include/dt-bindings/clock/rk3228-cru.h | 287 ------------------------- 7 files changed, 3 insertions(+), 601 deletions(-) delete mode 100644 arch/arm/dts/rk3229-evb.dts delete mode 100644 arch/arm/dts/rk3229.dtsi delete mode 100644 include/dt-bindings/clock/rk3228-cru.h
arch/arm/dts/Makefile +0 -3
@@ -52,9 +52,6 @@ dtb-$(CONFIG_MACH_S900) += \ dtb-$(CONFIG_MACH_S700) += \ s700-cubieboard7.dtb -dtb-$(CONFIG_ROCKCHIP_RK322X) += \ - rk3229-evb.dtb - dtb-$(CONFIG_ROCKCHIP_RK3368) += \ rk3368-sheep.dtb \ rk3368-geekbox.dtb \
arch/arm/dts/rk3229-evb.dts deleted +0 -256
256 lines not on this page · raw message
arch/arm/dts/rk3229.dtsi deleted +0 -52
52 lines not on this page · raw message
arch/arm/mach-rockchip/Kconfig +1 -0
@@ -109,6 +109,7 @@ config ROCKCHIP_RK322X select TPL_OF_LIBFDT select TPL_HAVE_INIT_STACK if TPL select SPL_DRIVERS_MISC + imply OF_UPSTREAM imply ROCKCHIP_COMMON_BOARD imply SPL_SERIAL imply SPL_ROCKCHIP_COMMON_BOARD
board/rockchip/evb_rk3229/MAINTAINERS +0 -1
@@ -1,7 +1,6 @@ EVB-RK3229 M: Kever Yang <[email protected]> S: Maintained -F: arch/arm/dts/rk3229-evb.dts F: arch/arm/dts/rk3229-evb-u-boot.dtsi F: board/rockchip/evb_rk3229 F: include/configs/evb_rk3229.h
configs/evb-rk3229_defconfig +2 -2
@@ -9,7 +9,7 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x61100000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3229-evb" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3229-evb" CONFIG_ROCKCHIP_RK322X=y CONFIG_TARGET_EVB_RK3229=y CONFIG_SPL_STACK_R_ADDR=0x60600000
@@ -24,7 +24,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y CONFIG_USE_PREBOOT=y -CONFIG_DEFAULT_FDT_FILE="rk3229-evb.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3229-evb.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x100000
include/dt-bindings/clock/rk3228-cru.h deleted +0 -287
287 lines not on this page · raw message
--
2.39.5
PATCH 3/3 rockchip: Switch rk3368 boards to upstream devicetree
In reply to Johan JonkerSwitch rk3368 boards to upstream devicetree. Remove rk3368-sheep board due lack of upstream support.
--- arch/arm/dts/Makefile | 5 - arch/arm/dts/rk3368-geekbox.dts | 281 ------ arch/arm/dts/rk3368-px5-evb.dts | 277 ------ arch/arm/dts/rk3368-sheep-u-boot.dtsi | 35 - arch/arm/dts/rk3368-sheep.dts | 286 ------ arch/arm/dts/rk3368-u-boot.dtsi | 4 + arch/arm/dts/rk3368.dtsi | 1218 ----------------------- arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/rk3368/Kconfig | 7 - board/rockchip/sheep_rk3368/Kconfig | 12 - board/rockchip/sheep_rk3368/MAINTAINERS | 6 - board/rockchip/sheep_rk3368/README | 44 - configs/evb-px5_defconfig | 2 +- configs/geekbox_defconfig | 2 +- configs/sheep-rk3368_defconfig | 32 - doc/board/rockchip/rockchip.rst | 1 - include/configs/sheep_rk3368.h | 15 - 17 files changed, 7 insertions(+), 2221 deletions(-) delete mode 100644 arch/arm/dts/rk3368-geekbox.dts delete mode 100644 arch/arm/dts/rk3368-px5-evb.dts delete mode 100644 arch/arm/dts/rk3368-sheep-u-boot.dtsi delete mode 100644 arch/arm/dts/rk3368-sheep.dts delete mode 100644 arch/arm/dts/rk3368.dtsi delete mode 100644 board/rockchip/sheep_rk3368/Kconfig delete mode 100644 board/rockchip/sheep_rk3368/MAINTAINERS delete mode 100644 board/rockchip/sheep_rk3368/README delete mode 100644 configs/sheep-rk3368_defconfig delete mode 100644 include/configs/sheep_rk3368.h
arch/arm/dts/Makefile +0 -5
@@ -52,11 +52,6 @@ dtb-$(CONFIG_MACH_S900) += \ dtb-$(CONFIG_MACH_S700) += \ s700-cubieboard7.dtb -dtb-$(CONFIG_ROCKCHIP_RK3368) += \ - rk3368-sheep.dtb \ - rk3368-geekbox.dtb \ - rk3368-px5-evb.dtb \ - dtb-$(CONFIG_ARCH_S5P4418) += \ s5p4418-nanopi2.dtb
arch/arm/dts/rk3368-geekbox.dts deleted +0 -281
281 lines not on this page · raw message
arch/arm/dts/rk3368-px5-evb.dts deleted +0 -277
277 lines not on this page · raw message
arch/arm/dts/rk3368-sheep-u-boot.dtsi deleted +0 -35
@@ -1,35 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 -/* - * (C) Copyright 2017 Theobroma Systems Design und Consulting GmbH - */ - -#include "rk3368-u-boot.dtsi" - -&pinctrl { - bootph-all; -}; - -&service_msch { - bootph-all; -}; - -&dmc { - bootph-all; - status = "okay"; -}; - -&pmugrf { - bootph-all; -}; - -&cru { - bootph-all; -}; - -&grf { - bootph-all; -}; - -&uart2 { - bootph-all; -};
arch/arm/dts/rk3368-sheep.dts deleted +0 -286
286 lines not on this page · raw message
arch/arm/dts/rk3368-u-boot.dtsi +4 -0
@@ -26,3 +26,7 @@ reg = <0x0 0xff740000 0x0 0x1000>; }; }; + +&xin24m { + bootph-all; +};
arch/arm/dts/rk3368.dtsi deleted +0 -1218
1,218 lines not on this page · raw message
arch/arm/mach-rockchip/Kconfig +1 -0
@@ -233,6 +233,7 @@ config ROCKCHIP_RK3368 select SUPPORT_SPL select SUPPORT_TPL select TPL_HAVE_INIT_STACK if TPL + imply OF_UPSTREAM imply ROCKCHIP_COMMON_BOARD imply SPL_ROCKCHIP_COMMON_BOARD imply SPL_SEPARATE_BSS
arch/arm/mach-rockchip/rk3368/Kconfig +0 -7
@@ -3,12 +3,6 @@ if ROCKCHIP_RK3368 choice prompt "RK3368 board" -config TARGET_SHEEP - bool "Sheep board" - help - Sheep board is designed by Rockchip as a EVB board - for rk3368. - config TARGET_GEEKBOX bool "GeekBox"
@@ -41,7 +35,6 @@ config SPL_LIBCOMMON_SUPPORT config SPL_LIBGENERIC_SUPPORT default y -source "board/rockchip/sheep_rk3368/Kconfig" source "board/geekbuying/geekbox/Kconfig" source "board/rockchip/evb_px5/Kconfig"
board/rockchip/sheep_rk3368/Kconfig deleted +0 -12
@@ -1,12 +0,0 @@ -if TARGET_SHEEP - -config SYS_BOARD - default "sheep_rk3368" - -config SYS_VENDOR - default "rockchip" - -config SYS_CONFIG_NAME - default "sheep_rk3368" - -endif
board/rockchip/sheep_rk3368/MAINTAINERS deleted +0 -6
@@ -1,6 +0,0 @@ -RK3368 Sheep Board -M: Andy Yan <[email protected]> -S: Maintained -F: board/rockchip/sheep_rk3368 -F: include/configs/sheep_rk3368.h -F: configs/sheep-rk3368_defconfig
board/rockchip/sheep_rk3368/README deleted +0 -44
44 lines not on this page · raw message
configs/evb-px5_defconfig +1 -1
@@ -7,7 +7,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3368-px5-evb" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3368-px5-evb" CONFIG_DM_RESET=y CONFIG_ROCKCHIP_RK3368=y CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl-v8.lds"
configs/geekbox_defconfig +1 -1
@@ -7,7 +7,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 -CONFIG_DEFAULT_DEVICE_TREE="rk3368-geekbox" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3368-geekbox" CONFIG_ROCKCHIP_RK3368=y CONFIG_TARGET_GEEKBOX=y CONFIG_SYS_LOAD_ADDR=0x800800
configs/sheep-rk3368_defconfig deleted +0 -32
@@ -1,32 +0,0 @@ -CONFIG_ARM=y -CONFIG_SKIP_LOWLEVEL_INIT=y -CONFIG_COUNTER_FREQUENCY=24000000 -CONFIG_ARCH_ROCKCHIP=y -CONFIG_TEXT_BASE=0x00200000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 -CONFIG_DEFAULT_DEVICE_TREE="rk3368-sheep" -CONFIG_ROCKCHIP_RK3368=y -CONFIG_SYS_LOAD_ADDR=0x800800 -CONFIG_DEBUG_UART_BASE=0xFF1b0000 -CONFIG_DEBUG_UART_CLOCK=24000000 -CONFIG_DEBUG_UART=y -CONFIG_ANDROID_BOOT_IMAGE=y -CONFIG_DEFAULT_FDT_FILE="rockchip/rk3368-sheep.dtb" -# CONFIG_DISPLAY_CPUINFO is not set -CONFIG_DISPLAY_BOARDINFO_LATE=y -CONFIG_CMD_MMC=y -CONFIG_ENV_RELOC_GD_ENV_ADDR=y -CONFIG_REGMAP=y -CONFIG_SYSCON=y -CONFIG_CLK=y -CONFIG_MMC_DW=y -CONFIG_MMC_DW_ROCKCHIP=y -CONFIG_PINCTRL=y -CONFIG_RAM=y -CONFIG_DEBUG_UART_SHIFT=2 -CONFIG_DEBUG_UART_ANNOUNCE=y -CONFIG_SYS_NS16550_MEM32=y -CONFIG_SYSRESET=y -CONFIG_ERRNO_STR=y
doc/board/rockchip/rockchip.rst +0 -1
@@ -76,7 +76,6 @@ List of mainline supported Rockchip boards: * rk3368 - GeekBox (geekbox) - PX5 EVB (evb-px5) - - Rockchip Sheep (sheep-rk3368) * rk3399 - 96boards RK3399 Ficus (ficus-rk3399) - 96boards Rock960 (rock960-rk3399)
include/configs/sheep_rk3368.h deleted +0 -15
@@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* -* Copyright (c) 2017 Rockchip Electronics Co., Ltd -*/ - -#ifndef __CONFIGS_PX5_EVB_H -#define __CONFIGS_PX5_EVB_H - -#include <configs/rk3368_common.h> - -#define KERNEL_LOAD_ADDR 0x280000 -#define DTB_LOAD_ADDR 0x5600000 -#define INITRD_LOAD_ADDR 0x5bf0000 - -#endif
--
2.39.5
Re: [PATCH v1 3/3] rockchip: Switch rk3368 boards to upstream devicetree
Hi Johan,
Thanks for looking into this, I'm quite happy to see work being done to remove the last (Rockchip) defconfigs without OF_UPSTREAM enabled. Ideally, we should only be left with generic-rk* defconfigs which are useful for bringing up new boards. Almost there :)
Quoted 3 lines · Johan Jonker
Switch rk3368 boards to upstream devicetree. Remove rk3368-sheep board due lack of upstream support.
Please have the removal in a separate patch, so that it's not hidden in a mail titled "I'm just migrating boards to use upstream DTS".
For all three patches here, how did you migrate the device tree? Did you check that we have parity upstream with what used to be before this patch? Did you check that the paths in SoC-specific boot_devices arrays still match the correct paths? Did you check we still bring in enough device tree nodes in xPL phases (maybe there are new inter-node links like -supply or -reset or -gpio properties but we don't enable those in xPL phases yet with bootph- properties? Did you test this on one or more devices?
Cheers,
Quentin