Merge tag 'sunxi-dt-for-3.12-4' of https://github.com/mripard/linux into late/all

From Maxime Ripard:
Allwinner DT changes for 3.12, take 3 and 4

These patches add support for:
  - The cubieboard2 board
  - The pinctrl driver that got merged for the A20 and A31
  - The associated muxing for the A20 and A31 boards already supported
  - Enables the gated clocks on the A10s, A20 and A31 DTSI.

* tag 'sunxi-dt-for-3.12-4' of https://github.com/mripard/linux:
  ARM: sun7i: Enable the A20 clocks in the DTSI
  ARM: sun6i: Enable clock support in the DTSI
  ARM: sun5i: dt: Use the A10s gates in the DTSI
  ARM: sun7i: Add Cubieboard2 Device Tree
  ARM: sun7i: a20-olinuxino: Enable the user LED
  ARM: sun7i: a20-olinuxino: Enable UARTs muxing
  ARM: sun7i: DT: Add UART muxing options to the DTSI
  ARM: sun7i: Add the PIO controller node to the DTSI
  ARM: sun6i: colombus: Add uart0 muxing
  ARM: sun6i: Add UART0 muxing options
  ARM: sunxi: dt: Add PIO controller to A31 DTSI

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

diff --combined arch/arm/boot/dts/Makefile
index 68701d937741ecc7f8637f4f564f55cbdb3e18b8,ec1a3f50d2269a63570062e69abe91e14b23f502..05f6c2a290196210785e22477e71cc48af670e80
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -53,14 -53,13 +53,14 @@@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210
        exynos4210-trats.dtb \
        exynos4210-universal_c210.dtb \
        exynos4412-odroidx.dtb \
 -      exynos4412-smdk4412.dtb \
        exynos4412-origen.dtb \
 +      exynos4412-smdk4412.dtb \
 +      exynos4412-trats2.dtb \
        exynos5250-arndale.dtb \
 -      exynos5440-sd5v1.dtb \
        exynos5250-smdk5250.dtb \
        exynos5250-snow.dtb \
        exynos5420-smdk5420.dtb \
 +      exynos5440-sd5v1.dtb \
        exynos5440-ssdk5440.dtb
  dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
        ecx-2000.dtb
@@@ -207,11 -206,15 +207,15 @@@ dtb-$(CONFIG_ARCH_STI)+= stih415-b2000.
        stih415-b2020.dtb \
        stih416-b2020.dtb
  dtb-$(CONFIG_ARCH_SUNXI) += \
+       sun4i-a10-a1000.dtb \
        sun4i-a10-cubieboard.dtb \
        sun4i-a10-mini-xplus.dtb \
        sun4i-a10-hackberry.dtb \
        sun5i-a10s-olinuxino-micro.dtb \
-       sun5i-a13-olinuxino.dtb
+       sun5i-a13-olinuxino.dtb \
+       sun6i-a31-colombus.dtb \
+       sun7i-a20-cubieboard2.dtb \
+       sun7i-a20-olinuxino-micro.dtb
  dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra20-iris-512.dtb \
        tegra20-medcom-wide.dtb \