Merge tag 'sunxi-dt-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git...

Allwinner DT changes for 4.13

The usual chunk of patches. The most notable improvements are the power
supplies improvements (battery and AC-IN), crypto support for the sun5i
family, HDMI support for the A10s, plus a lot of new things for the V3S and
the A83T.

* tag 'sunxi-dt-for-4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (47 commits)
  ARM: sun6i: a31s: primo81: Enable battery power supply
  ARM: sun6i: a31s: primo81: Change USB OTG to OTG mode
  ARM: sun8i: a83t: Add dt node for the syscon control module
  ARM: sun8i: a83t: Add device node for R_PIO
  ARM: sun8i: v3s: add device nodes for DE2 display pipeline
  ARM: dts: sunxi: add SoC specific compatibles for the crypto nodes
  ARM: sun5i: add a cryptographic engine node
  ARM: sun8i: a83t: Add device node for PRCM
  ARM: dts: sun8i: h3: Add initial NanoPi M1 Plus support
  ARM: dts: orange-pi-zero: add node for SPI NOR
  ARM: sun7i: a20: cubietruck: Tie AXP209's USB power supply to USB PHY
  ARM: sun6i: a31: hummingbird: Enable AXP221's ACIN power supply
  ARM: sun4i: a10: cubieboard: Enable AXP209's ACIN power supply
  ARM: sun7i: a20: bananapi-m1-plus: Enable AXP209's ACIN power supply
  ARM: sun7i: a20: cubieboard2: Enable AXP209's ACIN power supply
  ARM: sun7i: a20: cubieboard2: Move usb_otg node for alphabetical ordering
  ARM: sun8i: a83t: cubietruck-plus: Enable SPDIF output
  ARM: sun8i: a83t: cubietruck-plus: Add LED device nodes
  ARM: sun8i: a83t: Add device node for SPDIF transmitter
  ARM: sun8i: a83t: Add device node for DMA controller
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/boot/dts/Makefile
index f873fa156c2e4354fbd8dc3293ec1b9dbb5b9733,2d9b5b0b574724e8dd0fd4c094ec4671a2208b58..21e85c0f7fed65c1cf34c9ecca80b6056eeafa0d
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -72,7 -72,6 +72,7 @@@ dtb-$(CONFIG_ARCH_BCM2835) += 
        bcm2835-rpi-b-plus.dtb \
        bcm2835-rpi-a-plus.dtb \
        bcm2836-rpi-2-b.dtb \
 +      bcm2837-rpi-3-b.dtb \
        bcm2835-rpi-zero.dtb
  dtb-$(CONFIG_ARCH_BCM_5301X) += \
        bcm4708-asus-rt-ac56u.dtb \
@@@ -205,8 -204,7 +205,8 @@@ dtb-$(CONFIG_ARCH_KEYSTONE) += 
        keystone-k2hk-evm.dtb \
        keystone-k2l-evm.dtb \
        keystone-k2e-evm.dtb \
 -      keystone-k2g-evm.dtb
 +      keystone-k2g-evm.dtb \
 +      keystone-k2g-ice.dtb
  dtb-$(CONFIG_MACH_KIRKWOOD) += \
        kirkwood-b3.dtb \
        kirkwood-blackarmor-nas220.dtb \
@@@ -605,7 -603,6 +605,7 @@@ dtb-$(CONFIG_SOC_AM33XX) += 
        am335x-bone.dtb \
        am335x-boneblack.dtb \
        am335x-boneblack-wireless.dtb \
 +      am335x-boneblue.dtb \
        am335x-bonegreen.dtb \
        am335x-bonegreen-wireless.dtb \
        am335x-chiliboard.dtb \
@@@ -721,7 -718,7 +721,7 @@@ dtb-$(CONFIG_ARCH_RENESAS) += 
        r8a7794-silk.dtb \
        sh73a0-kzm9g.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 -      rk1108-evb.dtb \
 +      rv1108-evb.dtb \
        rk3036-evb.dtb \
        rk3036-kylin.dtb \
        rk3066a-bqcurie2.dtb \
@@@ -793,12 -790,9 +793,12 @@@ dtb-$(CONFIG_ARCH_STI) += 
  dtb-$(CONFIG_ARCH_STM32)+= \
        stm32f429-disco.dtb \
        stm32f469-disco.dtb \
 +      stm32f746-disco.dtb \
 +      stm32f769-disco.dtb \
        stm32429i-eval.dtb \
        stm32746g-eval.dtb \
 -      stm32h743i-eval.dtb
 +      stm32h743i-eval.dtb \
 +      stm32h743i-disco.dtb
  dtb-$(CONFIG_MACH_SUN4I) += \
        sun4i-a10-a1000.dtb \
        sun4i-a10-ba10-tvbox.dtb \
@@@ -901,6 -895,7 +901,7 @@@ dtb-$(CONFIG_MACH_SUN8I) += 
        sun8i-h3-bananapi-m2-plus.dtb \
        sun8i-h3-beelink-x2.dtb \
        sun8i-h3-nanopi-m1.dtb  \
+       sun8i-h3-nanopi-m1-plus.dtb \
        sun8i-h3-nanopi-neo.dtb \
        sun8i-h3-nanopi-neo-air.dtb \
        sun8i-h3-orangepi-2.dtb \
@@@ -911,7 -906,8 +912,8 @@@
        sun8i-h3-orangepi-plus.dtb \
        sun8i-h3-orangepi-plus2e.dtb \
        sun8i-r16-parrot.dtb \
-       sun8i-v3s-licheepi-zero.dtb
+       sun8i-v3s-licheepi-zero.dtb \
+       sun8i-v3s-licheepi-zero-dock.dtb
  dtb-$(CONFIG_MACH_SUN9I) += \
        sun9i-a80-optimus.dtb \
        sun9i-a80-cubieboard4.dtb