Hi Tom,
Please pull this PR.
thanks, Jagan.
The following changes since commit 5a0007d481c0fcd2d422dd48b2a129dd8e8a272a:
Prepare v2017.09-rc1 (2018-07-30 21:47:29 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-sunxi.git master
for you to fetch changes up to 89a897fc4d78e31332e5899e977d8bf3c82abafa:
board: sun50i: h6: Add OrangePi One Plus initial support (2018-07-31 20:50:01 +0530)
---------------------------------------------------------------- Icenowy Zheng (14): sunxi: change SUNXI_HIGH_SRAM option to SUNXI_SRAM_ADDRESS sunxi: add basic memory map definitions of H6 SoC sunxi: change RMR64's RVBAR address for H6 sunxi: change ATF position for H6 sunxi: add config for SPL at 0x20000 on H6 sunxi: change GIC address on H6 sunxi: add clock code for H6 sunxi: use sun6i-style watchdog for H6 sunxi: add UART0 setup for H6 sunxi: add MMC support for H6 sunxi: add DRAM support to H6 sunxi: add support for Allwinner H6 SoC sunxi: add support for Pine H64 board video: sunxi: de2: fix SimpleFB node creation when DE2 not probed
Jagan Teki (5): phy: sun4i-usb: Call phy_passby even for PHY#0 phy: sun4i-usb: Remove usb_clk_cfg set in probe phy: sun4i-usb: Update PHY#3 rst_mask only for H3_H5 configs: sunxi: Drop CONFIG_SUNXI_USB_PHYS board: sun50i: h6: Add OrangePi One Plus initial support
Mylène Josserand (2): mtd: nand: nand_base: Convert EINVAL into ENOTSUPP mtd: nand: sunxi: Return on set_feature only when not ENOTSUPP
Simon Baatz (1): sunxi: enable SATA on Banana Pi M2 Berry
arch/arm/dts/Makefile | 3 + arch/arm/dts/sun50i-h6-orangepi-one-plus.dts | 150 +++++ arch/arm/dts/sun50i-h6-pine-h64.dts | 185 ++++++ arch/arm/dts/sun50i-h6.dtsi | 288 +++++++++ arch/arm/include/asm/arch-sunxi/boot0.h | 4 + arch/arm/include/asm/arch-sunxi/clock.h | 2 + arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h | 320 +++++++++ arch/arm/include/asm/arch-sunxi/cpu.h | 2 + arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h | 73 +++ arch/arm/include/asm/arch-sunxi/dram.h | 2 + arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h | 297 +++++++++ arch/arm/include/asm/arch-sunxi/gpio.h | 1 + arch/arm/include/asm/arch-sunxi/mmc.h | 2 +- arch/arm/include/asm/arch-sunxi/spl.h | 6 +- arch/arm/include/asm/arch-sunxi/timer.h | 2 +- arch/arm/mach-sunxi/Kconfig | 37 +- arch/arm/mach-sunxi/Makefile | 2 + arch/arm/mach-sunxi/board.c | 6 +- arch/arm/mach-sunxi/clock_sun50i_h6.c | 94 +++ arch/arm/mach-sunxi/cpu_info.c | 2 + arch/arm/mach-sunxi/dram_sun50i_h6.c | 755 ++++++++++++++++++++++ arch/arm/mach-sunxi/rmr_switch.S | 6 + board/sunxi/MAINTAINERS | 10 + board/sunxi/board.c | 7 + board/sunxi/mksunxi_fit_atf.sh | 10 +- common/spl/Kconfig | 2 +- configs/bananapi_m2_berry_defconfig | 3 + configs/orangepi_one_plus_defconfig | 14 + configs/pine_h64_defconfig | 15 + drivers/mmc/sunxi_mmc.c | 13 +- drivers/mtd/nand/nand_base.c | 4 +- drivers/mtd/nand/sunxi_nand.c | 2 +- drivers/phy/allwinner/phy-sun4i-usb.c | 10 +- drivers/video/sunxi/sunxi_de2.c | 3 + include/configs/sun4i.h | 2 - include/configs/sun50i.h | 7 +- include/configs/sun5i.h | 2 - include/configs/sun6i.h | 2 - include/configs/sun7i.h | 2 - include/configs/sun8i.h | 10 - include/configs/sunxi-common.h | 24 +- include/dt-bindings/clock/sun50i-h6-ccu.h | 125 ++++ include/dt-bindings/clock/sun50i-h6-r-ccu.h | 24 + include/dt-bindings/reset/sun50i-h6-ccu.h | 73 +++ include/dt-bindings/reset/sun50i-h6-r-ccu.h | 17 + scripts/config_whitelist.txt | 1 - 46 files changed, 2560 insertions(+), 61 deletions(-) create mode 100644 arch/arm/dts/sun50i-h6-orangepi-one-plus.dts create mode 100644 arch/arm/dts/sun50i-h6-pine-h64.dts create mode 100644 arch/arm/dts/sun50i-h6.dtsi create mode 100644 arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h create mode 100644 arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun50i_h6.h create mode 100644 arch/arm/mach-sunxi/clock_sun50i_h6.c create mode 100644 arch/arm/mach-sunxi/dram_sun50i_h6.c create mode 100644 configs/orangepi_one_plus_defconfig create mode 100644 configs/pine_h64_defconfig create mode 100644 include/dt-bindings/clock/sun50i-h6-ccu.h create mode 100644 include/dt-bindings/clock/sun50i-h6-r-ccu.h create mode 100644 include/dt-bindings/reset/sun50i-h6-ccu.h create mode 100644 include/dt-bindings/reset/sun50i-h6-r-ccu.h