rockchip: puma: reorganize devicetrees to actually work and match upstream
authorHeiko Stuebner <heiko.stuebner@theobroma-systems.com>
Fri, 5 Jun 2020 10:06:40 +0000 (12:06 +0200)
committerKever Yang <kever.yang@rock-chips.com>
Sun, 7 Jun 2020 10:57:16 +0000 (18:57 +0800)
commit97fa7847253cda048f290e640c1903130351860d
treec63fe7bc1fc03376912e0ac664102813a0bc1a99
parentc4faf85ab6dac96b31355f19c998fc98e95fe8e5
rockchip: puma: reorganize devicetrees to actually work and match upstream

So far the puma dts files only just included the main puma dtsi without
handling the actual baseboard and rk3399-puma.dtsi was very much
detached from the variant in the mainline Linux kernel.

Recent changes resulted in a strange situation with nonworking puma boards.

Commit ab800e5a6f28 ("arm: dts: rockchip: puma: move U-Boot specific bits to u-boot.dtsi")
moved the sdram include from rk3399-puma-ddrX.dts to new files
rk3399-puma-ddrx-u-boot.dtsi which were never included anywhere though.

Commit 167efc2c7a46 ("arm64: dts: rk3399: Sync v5.7-rc1 from Linux")
replaced the rk3399-puma.dtsi nearly completely, but in the kernel
it definitly depends on a baseboard dts to actually enable peripherals
like sd-slot, uarts, etc.

So to untagle this and bring the whole thing more in line with mainline
Linux, bring the rk3399-puma-haikou.dts over as well, drop the separate
DDR-option devicetrees and instead replace them with a puma Kconfig option
to select and include the needed DDR variant.

Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
12 files changed:
arch/arm/dts/Makefile
arch/arm/dts/rk3399-puma-ddr1333-u-boot.dtsi [deleted file]
arch/arm/dts/rk3399-puma-ddr1333.dts [deleted file]
arch/arm/dts/rk3399-puma-ddr1600-u-boot.dtsi [deleted file]
arch/arm/dts/rk3399-puma-ddr1600.dts [deleted file]
arch/arm/dts/rk3399-puma-ddr1866-u-boot.dtsi [deleted file]
arch/arm/dts/rk3399-puma-ddr1866.dts [deleted file]
arch/arm/dts/rk3399-puma-haikou-u-boot.dtsi [new file with mode: 0644]
arch/arm/dts/rk3399-puma-haikou.dts [new file with mode: 0644]
arch/arm/dts/rk3399-puma-u-boot.dtsi [deleted file]
board/theobroma-systems/puma_rk3399/Kconfig
configs/puma-rk3399_defconfig