diff options
author | Heiko Stuebner <heiko.stuebner@theobroma-systems.com> | 2020-06-05 12:06:40 +0200 |
---|---|---|
committer | Kever Yang <kever.yang@rock-chips.com> | 2020-06-07 18:57:16 +0800 |
commit | 97fa7847253cda048f290e640c1903130351860d (patch) | |
tree | c63fe7bc1fc03376912e0ac664102813a0bc1a99 /arch/arm/dts/sun50i-h6-orangepi.dtsi | |
parent | c4faf85ab6dac96b31355f19c998fc98e95fe8e5 (diff) |
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>
Diffstat (limited to 'arch/arm/dts/sun50i-h6-orangepi.dtsi')
0 files changed, 0 insertions, 0 deletions