Hi Tom,

please pull this branch, containing the fixed version of yesterday's PR. Beside the one issue you found there was an intermediate issue (a few commits in-between failing to compile), which I fixed as well. I also added the missing commit to actually introduce the pinephone_defconfig, without which most of the other commits are somewhat useless. Compile-tested HEAD for all 152 sunxi boards, compile-tested all commits for Pine64 and OrangePi Zero, boot-tested on Pine64-LTS and OrangePi Zero.

Summary: - PinePhone support (Samuel) - V3/S3 support (Icenowy)

Thanks, Andre

==============

The following changes since commit 9324c9a823ed91d901fb56954f438f9854b19bb5:

Merge tag 'ti-v2021.01-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti (2020-11-16 13:42:29 -0500)

are available in the Git repository at:

https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi.git pr-2020-11-17

for you to fetch changes up to 6d5d6bb50d2930319fd6421554b98e17ebdb5fb6:

sunxi: dts: sync Allwinner V3s-related DTs from Linux 5.10-rc1 (2020-11-17 00:42:21 +0000)

---------------------------------------------------------------- Icenowy Zheng (5): sunxi: add V3/S3 support sunxi: gpio: introduce compatible string for V3 GPIO clk: sunxi: add compatible string for V3 sunxi: allow to use AXP20[39] attached to I2C0 on V3 series sunxi: dts: sync Allwinner V3s-related DTs from Linux 5.10-rc1

Samuel Holland (8): sunxi: board: Use a more descriptive variable name sunxi: board: Add a helper to get the SPL DT name sunxi: board: Simplify Pine A64 DT selection logic sunxi: board: Add PinePhone DT selection logic sunxi: board: Save the chosen DT name in the SPL header sunxi: board: Set fdtfile to match the DT chosen by SPL sunxi: DT: A64: update device tree files sunxi: a64: Add a defconfig for the PinePhone

arch/arm/dts/Makefile | 4 + arch/arm/dts/axp803.dtsi | 82 ++-- arch/arm/dts/sun50i-a64-amarula-relic.dts | 109 ++++- arch/arm/dts/sun50i-a64-bananapi-m64.dts | 118 ++++-- arch/arm/dts/sun50i-a64-cpu-opp.dtsi | 75 ++++ arch/arm/dts/sun50i-a64-nanopi-a64.dts | 70 +--- arch/arm/dts/sun50i-a64-oceanic-5205-5inmfd.dts | 31 +- arch/arm/dts/sun50i-a64-olinuxino-emmc.dts | 12 +- arch/arm/dts/sun50i-a64-olinuxino.dts | 113 +++-- arch/arm/dts/sun50i-a64-orangepi-win.dts | 127 ++++-- arch/arm/dts/sun50i-a64-pine64-lts.dts | 7 +- arch/arm/dts/sun50i-a64-pine64-plus.dts | 52 +-- arch/arm/dts/sun50i-a64-pine64.dts | 97 +++-- arch/arm/dts/sun50i-a64-pinebook-u-boot.dtsi | 17 - arch/arm/dts/sun50i-a64-pinebook.dts | 237 ++++++++--- arch/arm/dts/sun50i-a64-pinephone-1.0.dts | 11 + arch/arm/dts/sun50i-a64-pinephone-1.1.dts | 30 ++ arch/arm/dts/sun50i-a64-pinephone-1.2.dts | 40 ++ arch/arm/dts/sun50i-a64-pinephone.dtsi | 429 +++++++++++++++++++ arch/arm/dts/sun50i-a64-pinetab.dts | 460 ++++++++++++++++++++ arch/arm/dts/sun50i-a64-sopine-baseboard.dts | 113 +++-- arch/arm/dts/sun50i-a64-sopine.dtsi | 69 ++- arch/arm/dts/sun50i-a64-teres-i-u-boot.dtsi | 41 -- arch/arm/dts/sun50i-a64-teres-i.dts | 138 +++++- arch/arm/dts/sun50i-a64.dtsi | 532 +++++++++++++++++++----- arch/arm/dts/sun8i-s3-lichee-zero-plus.dts | 53 +++ arch/arm/dts/sun8i-s3-pinecube.dts | 235 +++++++++++ arch/arm/dts/sun8i-v3.dtsi | 27 ++ arch/arm/dts/sun8i-v3s-licheepi-zero-dock.dts | 96 +++++ arch/arm/dts/sun8i-v3s-licheepi-zero.dts | 26 +- arch/arm/dts/sun8i-v3s.dtsi | 318 ++++++++++++-- arch/arm/include/asm/arch-sunxi/gpio.h | 1 + arch/arm/mach-sunxi/Kconfig | 10 +- board/sunxi/MAINTAINERS | 5 + board/sunxi/board.c | 102 ++++- configs/pinephone_defconfig | 12 + drivers/clk/sunxi/clk_v3s.c | 2 + drivers/gpio/sunxi_gpio.c | 1 + drivers/power/Kconfig | 4 +- include/dt-bindings/clock/sun50i-a64-ccu.h | 4 +- include/dt-bindings/clock/sun8i-de2.h | 3 + include/dt-bindings/reset/sun8i-de2.h | 1 + 42 files changed, 3230 insertions(+), 684 deletions(-) create mode 100644 arch/arm/dts/sun50i-a64-cpu-opp.dtsi delete mode 100644 arch/arm/dts/sun50i-a64-pinebook-u-boot.dtsi create mode 100644 arch/arm/dts/sun50i-a64-pinephone-1.0.dts create mode 100644 arch/arm/dts/sun50i-a64-pinephone-1.1.dts create mode 100644 arch/arm/dts/sun50i-a64-pinephone-1.2.dts create mode 100644 arch/arm/dts/sun50i-a64-pinephone.dtsi create mode 100644 arch/arm/dts/sun50i-a64-pinetab.dts delete mode 100644 arch/arm/dts/sun50i-a64-teres-i-u-boot.dtsi create mode 100644 arch/arm/dts/sun8i-s3-lichee-zero-plus.dts create mode 100644 arch/arm/dts/sun8i-s3-pinecube.dts create mode 100644 arch/arm/dts/sun8i-v3.dtsi create mode 100644 arch/arm/dts/sun8i-v3s-licheepi-zero-dock.dts create mode 100644 configs/pinephone_defconfig