]> git.dujemihanovic.xyz Git - u-boot.git/commit
arm: dts: kirkwood: Enable upstream DT on Kirkwood boards
authorTony Dinh <mibodhi@gmail.com>
Mon, 1 Apr 2024 22:08:16 +0000 (15:08 -0700)
committerStefan Roese <sr@denx.de>
Thu, 4 Apr 2024 08:44:47 +0000 (10:44 +0200)
commit09b6efad53e9cc039b5e2f0fa00ec7f333dcc601
treed418f6ad1270921f16dcdf1950002048d4e318e8
parentcdfcc37428e06f4730ab9a17cc084eeb7676ea1a
arm: dts: kirkwood: Enable upstream DT on Kirkwood boards

Enable OF_UPSTREAM to use upstream DT and add marvell/ prefix to the
DEFAULT_DEVICE_TREE for Kirkwood boards. And so we can directly build
DTBs from dts/upstream/src/arm/marvell, and including *-u-boot.dtsi
files from arch/arm/dts/ directory.

Background:

The following 2 commands and filters were used in the analysis to determine
which upstream DTS and DTSI files can be used as they are, or need to have
modified/created *-u-boot.dtsi for u-boot specific implementation, and
which board should be opt-out from OF_UPSTREAM.

"git grep -li arch_kirkwood configs | xargs grep DEVICE_TREE | cut -d '"' -f2 | xargs -n1 sh -c 'diff -qs  arch/arm/dts/$1.dts dts/upstream/src/arm/marvell/$1.dts' sh | grep differ"
"diff -qrbu arch/arm/dts/ dts/upstream/src/arm/marvell/ | grep kirkwood | grep ".dtsi ""

More detailed information can be found at:
https://lore.kernel.org/u-boot/20240328021825.17935-1-mibodhi@gmail.com/T/#u

I've regression tested this patch with the Zyxel NSA325 (Kirkwood 88F6282)
and Zyxel NSA310S (Kirkwood 88F6281). The Zyxel NSA325 board has a
USB 3.0 controller attached to the PCIe bus. And the Zyxel NSA310S
has an extensive overhaul in bindings and styles in upstream DTS version.

Tested-by: Michael Walle <michael@walle.cc> # on lschv2
Acked-by: Sumit Garg <sumit.garg@linaro.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Tony Dinh <mibodhi@gmail.com>
33 files changed:
arch/arm/dts/kirkwood-dreamplug-u-boot.dtsi [new file with mode: 0644]
arch/arm/dts/kirkwood-lschlv2-u-boot.dtsi
arch/arm/dts/kirkwood-lsxhl-u-boot.dtsi
arch/arm/dts/kirkwood-nsa325-u-boot.dtsi [new file with mode: 0644]
arch/arm/mach-kirkwood/Kconfig
configs/SBx81LIFKW_defconfig
configs/SBx81LIFXCAT_defconfig
configs/d2net_v2_defconfig
configs/dns325_defconfig
configs/dockstar_defconfig
configs/dreamplug_defconfig
configs/ds109_defconfig
configs/goflexhome_defconfig
configs/guruplug_defconfig
configs/ib62x0_defconfig
configs/iconnect_defconfig
configs/inetspace_v2_defconfig
configs/lschlv2_defconfig
configs/lsxhl_defconfig
configs/nas220_defconfig
configs/net2big_v2_defconfig
configs/netspace_lite_v2_defconfig
configs/netspace_max_v2_defconfig
configs/netspace_mini_v2_defconfig
configs/netspace_v2_defconfig
configs/nsa310s_defconfig
configs/nsa325_defconfig
configs/openrd_base_defconfig
configs/openrd_client_defconfig
configs/openrd_ultimate_defconfig
configs/pogo_e02_defconfig
configs/pogo_v4_defconfig
configs/sheevaplug_defconfig