Merge tag 'sunxi-dt-for-3.16-2' of https://github.com/mripard/linux into for-next

Merge "Allwinner DT changes for 3.16, take 2" from Maxime Ripard:

  - Introduction of a new board, the i12-tvbox
  - Enable the MMC and USB controllers on the Colombus
  - Add the enable-method to the A31 cpus
  - a few fixes

* tag 'sunxi-dt-for-3.16-2' of https://github.com/mripard/linux:
  ARM: dts: sun7i: Add new i12-tvbox board
  ARM: dts: sun7i: cubietruck: set mmc3 bus-width property
  ARM: sun6i: Add MMC0 controller to the Colombus board
  ARM: sun6i: Fix OHCI2 node name
  ARM: sun6i: Enable USB Host support on the Colombus board
  ARM: sunxi: Add fixed 3V regulator
  ARM: sun6i: Define the A31 CPUs enable-method
  ARM: sunxi: dt: build DTs according to new MACH_SUNxI Kconfig symbols

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Conflicts:
	arch/arm/boot/dts/Makefile

diff --cc arch/arm/boot/dts/Makefile
index e095bd265111e7293b8314020158da40b3fe3142,e3668e65df6476d4b1d25ae39e62125c1b125ab3..5f55146a4bad1973c96ceee545147c30faf0e316
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -336,13 -335,11 +336,13 @@@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-
        spear320-evb.dtb \
        spear320-hmi.dtb
  dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
 -dtb-$(CONFIG_ARCH_STI)+= stih415-b2000.dtb \
 -      stih416-b2000.dtb \
 +dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.dtb \
 +      stih415-b2000.dtb \
        stih415-b2020.dtb \
 -      stih416-b2020.dtb
 +      stih416-b2000.dtb \
 +      stih416-b2020.dtb \
 +      stih416-b2020-revE.dtb
- dtb-$(CONFIG_ARCH_SUNXI) += \
+ dtb-$(CONFIG_MACH_SUN4I) += \
        sun4i-a10-a1000.dtb \
        sun4i-a10-cubieboard.dtb \
        sun4i-a10-mini-xplus.dtb \