This is an updated version of the series which brings the exact mainline Linux device tree files for various Allwinner boards into U-Boot. Apart from using the usually more correct reference DT files, this offers the big benefit of being able to use U-Boot's DT copy for directly passing it to the kernel. This avoids to actually load a .dtb file from somewhere, and allows seamless and automatic UEFI booting, so distribution installer images should just work (TM).
This covers the ARMv8 SoCs (H5, A64), but also all boards with the H3, as this is somewhat married to the H5 and can only be updated together. The H3 and H5 DT files have diverged quite a bit, but as U-Boot's own usage of the DT is (yet) quite limited, there should be no regressions. The patches are split to first update the SoC .dtsi file, then the board .dts files in a second patch. They are grouped to handle the A64 first, then the H5 and H3. I put the respective kernel commit IDs in the commit messages. Patch 6 brings in the mainline DT for the SoPine baseboard, for which we didn't have a separate .dts in U-Boot so far.
This is based on origin/master, and requires the USB shutdown fix. Please let me know what I should it base it against, maybe closer to the time we actually want to merge this (to avoid playing cat and mouse here).
Maxime, I kept you Acked-by: from the previous posts, as I literally just updated to the latest Linux master, which went through your review anyway. Hope that's OK for you.
Cheers, Andre.
Changelog v6 .. v7: - drop Pine64-LTS DT (will send it to Linux first) - update to Linux v4.18-rc3
Changelog v5 .. v6: - bring back DT update patches - update to Linux v4.17-rc5
Changelog v4 .. v5: - drop Linux DT update patches for now - fix minor checkpatch complaints
Changelog v3 .. v4: - remove MMC environment for all Allwinner boards (including 32 bit ones) - keep MMC environment offset to the old values - drop DT adjustments to use fixed MMC regulator
Changelog v2 .. v3: 01: added, was on the list before 02: drop redundant H5 line 03-08: unchanged 09-20: added
Changelog v1 .. v2: 01, 02, 03: unchanged 04, 05, 06, 07: added
Andre Przywara (6): sunxi: DT: A64: update device tree file for Allwinner A64 SoC sunxi: DT: A64: update board .dts files from Linux sunxi: DT: update device tree files for Allwinner H3 and H5 SoCs sunxi: DT: H5: update board .dts files from Linux sunxi: DT: H3: update board .dts files from Linux sunxi: DT: A64: add proper SoPine baseboard device tree
arch/arm/dts/Makefile | 3 +- arch/arm/dts/axp803.dtsi | 155 +++++ arch/arm/dts/sun50i-a64-bananapi-m64.dts | 195 +++++- arch/arm/dts/sun50i-a64-nanopi-a64.dts | 111 ++- arch/arm/dts/sun50i-a64-olinuxino.dts | 153 ++++- arch/arm/dts/sun50i-a64-orangepi-win.dts | 135 +++- arch/arm/dts/sun50i-a64-pine64-plus-u-boot.dtsi | 59 -- arch/arm/dts/sun50i-a64-pine64-plus.dts | 17 +- arch/arm/dts/sun50i-a64-pine64.dts | 186 ++++- arch/arm/dts/sun50i-a64-sopine-baseboard.dts | 150 +++++ arch/arm/dts/sun50i-a64-sopine.dtsi | 142 ++++ arch/arm/dts/sun50i-a64.dtsi | 305 ++++++++- arch/arm/dts/sun50i-h5-libretech-all-h3-cc.dts | 5 +- arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts | 122 +++- arch/arm/dts/sun50i-h5-nanopi-neo2.dts | 91 ++- arch/arm/dts/sun50i-h5-orangepi-pc2.dts | 151 ++++- arch/arm/dts/sun50i-h5-orangepi-prime.dts | 176 ++++- arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts | 64 +- arch/arm/dts/sun50i-h5.dtsi | 38 +- arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts | 55 +- arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts | 96 ++- arch/arm/dts/sun8i-h3-libretech-all-h3-cc.dts | 3 +- arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts | 78 +++ arch/arm/dts/sun8i-h3-nanopi-m1.dts | 42 ++ arch/arm/dts/sun8i-h3-nanopi-neo-air.dts | 28 +- arch/arm/dts/sun8i-h3-nanopi-neo.dts | 17 + arch/arm/dts/sun8i-h3-nanopi.dtsi | 13 +- arch/arm/dts/sun8i-h3-orangepi-2.dts | 92 ++- arch/arm/dts/sun8i-h3-orangepi-lite.dts | 57 +- arch/arm/dts/sun8i-h3-orangepi-one.dts | 116 +++- arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts | 11 +- arch/arm/dts/sun8i-h3-orangepi-pc.dts | 141 +++- arch/arm/dts/sun8i-h3-orangepi-plus.dts | 29 +- arch/arm/dts/sun8i-h3-orangepi-plus2e.dts | 15 +- arch/arm/dts/sun8i-h3.dtsi | 602 +++-------------- arch/arm/dts/sunxi-h3-h5.dtsi | 860 ++++++++++++++++++++++++ arch/arm/dts/sunxi-libretech-all-h3-cc.dtsi | 2 - configs/sopine_baseboard_defconfig | 2 +- include/dt-bindings/clock/sun8i-de2.h | 18 + include/dt-bindings/clock/sun8i-r-ccu.h | 59 ++ include/dt-bindings/reset/sun8i-de2.h | 14 + include/dt-bindings/reset/sun8i-r-ccu.h | 53 ++ 42 files changed, 3741 insertions(+), 920 deletions(-) create mode 100644 arch/arm/dts/axp803.dtsi delete mode 100644 arch/arm/dts/sun50i-a64-pine64-plus-u-boot.dtsi create mode 100644 arch/arm/dts/sun50i-a64-sopine-baseboard.dts create mode 100644 arch/arm/dts/sun50i-a64-sopine.dtsi create mode 100644 arch/arm/dts/sunxi-h3-h5.dtsi create mode 100644 include/dt-bindings/clock/sun8i-de2.h create mode 100644 include/dt-bindings/clock/sun8i-r-ccu.h create mode 100644 include/dt-bindings/reset/sun8i-de2.h create mode 100644 include/dt-bindings/reset/sun8i-r-ccu.h