Hi Tom,
please pull the master branch from u-boot-sunxi, containing the second part of the sunxi pull request for the 2021.04 merge window: ------------------------- - New Allwinner H616 SoC support (sans Ethernet & USB) - H6 DT update - Tanix TX6 TV box support - OrangePi 3 support - OrangePi Zero2 (H616) support -------------------------
The H616 support was in the making since November, I deem it's ready for further testing in mainline now.
Compile-tested HEAD for all 154 sunxi boards, compile-tested all commits for Pine64-LTS and OrangePi Zero, tested (FEL, MMC, USB, Ethernet) incl. Linux boot on OrangePi Zero2, Pine64-LTS, Pine H64, BananaPi M1, BananaPi M2 Berry (R40) and OrangePi Zero.
Thanks, Andre
========================================= The following changes since commit 4057b98ff2f3fd112f05024cad5ccf970fa9bed4:
Merge tag 'u-boot-imx-20210125' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx (2021-01-25 09:02:35 -0500)
are available in the Git repository at:
https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi.git master
for you to fetch changes up to 38be6b838780e8ad0ee80e716752c8843cd87e05:
sunxi: Add support for OrangePi Zero2 (2021-01-25 21:52:01 +0000)
---------------------------------------------------------------- Andre Heider (1): sunxi: Add support for Orange Pi 3
Andre Przywara (4): net: sun8i-emac: Allow all RGMII PHY modes sunxi: Properly check for SATAPWR and MACPWR sunxi: support loading with SPL > 32KB mmc: sunxi: Refactor mod clock register offset
Jernej Skrabec (18): ARM: dts: sunxi: h6: Update DT files sunxi: Add support for Tanix TX6 sunxi: Add support for AXP305 PMIC sunxi: Introduce common symbol for H6 like SoCs mmc: sunxi: Replace H6 ifdefs with H6 gen macro i2c: mvtwsi: sunxi: update macro sunxi: prcm: Add memory map for H6 like SoCs sunxi: Add support for I2C on H6 like SoCs sunxi: introduce support for H616 clocks sunxi: add support for H616 uart0 sunxi: add support for R_I2C on H616 sunxi: Add H616 DRAM support sunxi: Add support for H616 SoC sunxi: Add H616 FEL support arm: sunxi: add initial H616 DTSI and headers sunxi: gpio: introduce compatible for H616 clk: sunxi: Add support for H616 clocks sunxi: Add support for OrangePi Zero2
arch/arm/cpu/armv8/fel_utils.S | 5 +- arch/arm/dts/Makefile | 6 +- arch/arm/dts/sun50i-h6-beelink-gs1.dts | 70 +- arch/arm/dts/sun50i-h6-cpu-opp.dtsi | 117 +++ arch/arm/dts/sun50i-h6-orangepi-3.dts | 345 +++++++ arch/arm/dts/sun50i-h6-orangepi-lite2.dts | 71 +- arch/arm/dts/sun50i-h6-orangepi-one-plus.dts | 41 +- arch/arm/dts/sun50i-h6-orangepi.dtsi | 72 +- arch/arm/dts/sun50i-h6-pine-h64.dts | 102 +- arch/arm/dts/sun50i-h6-tanix-tx6.dts | 124 +++ arch/arm/dts/sun50i-h6.dtsi | 394 +++++++- arch/arm/dts/sun50i-h616-orangepi-zero2.dts | 242 +++++ arch/arm/dts/sun50i-h616.dtsi | 750 ++++++++++++++ arch/arm/dts/sunxi-u-boot.dtsi | 8 + arch/arm/include/asm/arch-sunxi/boot0.h | 2 +- arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h | 19 +- arch/arm/include/asm/arch-sunxi/cpu.h | 2 +- arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h | 7 + arch/arm/include/asm/arch-sunxi/dram.h | 2 + arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h | 159 +++ arch/arm/include/asm/arch-sunxi/gpio.h | 2 + arch/arm/include/asm/arch-sunxi/mmc.h | 2 +- arch/arm/include/asm/arch-sunxi/prcm.h | 247 +---- arch/arm/include/asm/arch-sunxi/prcm_sun50i.h | 47 + arch/arm/include/asm/arch-sunxi/prcm_sun6i.h | 247 +++++ arch/arm/include/asm/arch-sunxi/timer.h | 2 +- arch/arm/mach-sunxi/Kconfig | 75 +- arch/arm/mach-sunxi/Makefile | 4 +- arch/arm/mach-sunxi/board.c | 26 +- arch/arm/mach-sunxi/clock_sun50i_h6.c | 37 +- arch/arm/mach-sunxi/cpu_info.c | 2 + arch/arm/mach-sunxi/dram_sun50i_h616.c | 1023 ++++++++++++++++++++ arch/arm/mach-sunxi/dram_timings/Makefile | 2 + arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c | 94 ++ arch/arm/mach-sunxi/pmic_bus.c | 6 + arch/arm/mach-sunxi/rmr_switch.S | 2 +- board/sunxi/MAINTAINERS | 16 + board/sunxi/board.c | 48 +- common/spl/Kconfig | 7 +- configs/orangepi_3_defconfig | 12 + configs/orangepi_zero2_defconfig | 13 + configs/tanix_tx6_defconfig | 10 + drivers/clk/sunxi/Kconfig | 7 + drivers/clk/sunxi/Makefile | 1 + drivers/clk/sunxi/clk_h616.c | 120 +++ drivers/gpio/sunxi_gpio.c | 2 + drivers/i2c/mvtwsi.c | 2 +- drivers/mmc/sunxi_mmc.c | 96 +- drivers/net/sun8i_emac.c | 3 + drivers/power/Kconfig | 14 +- drivers/power/Makefile | 1 + drivers/power/axp305.c | 83 ++ include/axp305.h | 17 + include/axp_pmic.h | 3 + include/configs/sun50i.h | 2 +- include/configs/sunxi-common.h | 7 + include/dt-bindings/clock/sun50i-h6-r-ccu.h | 2 + include/dt-bindings/clock/sun50i-h616-ccu.h | 115 +++ include/dt-bindings/reset/sun50i-h6-r-ccu.h | 1 + include/dt-bindings/reset/sun50i-h616-ccu.h | 70 ++ 61 files changed, 4587 insertions(+), 423 deletions(-) create mode 100644 arch/arm/dts/sun50i-h6-cpu-opp.dtsi create mode 100644 arch/arm/dts/sun50i-h6-orangepi-3.dts create mode 100644 arch/arm/dts/sun50i-h6-tanix-tx6.dts create mode 100644 arch/arm/dts/sun50i-h616-orangepi-zero2.dts create mode 100644 arch/arm/dts/sun50i-h616.dtsi create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun50i_h616.h create mode 100644 arch/arm/include/asm/arch-sunxi/prcm_sun50i.h create mode 100644 arch/arm/include/asm/arch-sunxi/prcm_sun6i.h create mode 100644 arch/arm/mach-sunxi/dram_sun50i_h616.c create mode 100644 arch/arm/mach-sunxi/dram_timings/h616_ddr3_1333.c create mode 100644 configs/orangepi_3_defconfig create mode 100644 configs/orangepi_zero2_defconfig create mode 100644 configs/tanix_tx6_defconfig create mode 100644 drivers/clk/sunxi/clk_h616.c create mode 100644 drivers/power/axp305.c create mode 100644 include/axp305.h create mode 100644 include/dt-bindings/clock/sun50i-h616-ccu.h create mode 100644 include/dt-bindings/reset/sun50i-h616-ccu.h