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

From Maxime Ripard:
Allwinner sunXi SoCs device tree changes for 3.13

This DT series sees the introduction of the cubietruck DT, plus the addition of
the i2c controller for the A20 based boards, and of the Security ID found in
all the Allwinner SoCs but the A31.

* tag 'sunxi-dt-for-3.13' of https://github.com/mripard/linux:
  ARM: sunxi: dts: Add support for the cubieboard3, the CubieTruck
  ARM: sun7i: olinuxino-micro: Enable the I2C controllers
  ARM: sun7i: cubieboard2: Enable the I2C controllers
  ARM: sun7i: Add the pin muxing options for the I2C controllers
  ARM: sun7i: Enable the I2C controllers
  ARM: sunxi: dt: Add sunxi-sid to dts for sun4i, sun5i and sun7i

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

diff --combined arch/arm/boot/dts/Makefile
index 8265f98b4c55bf39ca02f75f214f87e190695c27,171e6c7bb1f21359543fe7ca4a1c4f076924ad09..d4dff18e332ceed8c1d2b2fe49c7acc0c5276833
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -41,8 -41,6 +41,8 @@@ dtb-$(CONFIG_ARCH_AT91)       += sama5d33ek.d
  dtb-$(CONFIG_ARCH_AT91)       += sama5d34ek.dtb
  dtb-$(CONFIG_ARCH_AT91)       += sama5d35ek.dtb
  
 +dtb-$(CONFIG_ARCH_ATLAS6) += atlas6-evb.dtb
 +
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
  dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \
        bcm28155-ap.dtb
@@@ -51,7 -49,6 +51,7 @@@ dtb-$(CONFIG_ARCH_DAVINCI) += da850-enb
  dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
        dove-cubox.dtb \
        dove-d2plug.dtb \
 +      dove-d3plug.dtb \
        dove-dove-db.dtb
  dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
        exynos4210-smdkv310.dtb \
@@@ -113,7 -110,6 +113,7 @@@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-
        armada-xp-axpwifiap.dtb \
        armada-xp-db.dtb \
        armada-xp-gp.dtb \
 +      armada-xp-matrix.dtb \
        armada-xp-openblocks-ax3-4.dtb
  dtb-$(CONFIG_ARCH_MXC) += \
        imx25-karo-tx25.dtb \
@@@ -174,15 -170,9 +174,15 @@@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap242
        omap3-devkit8000.dtb \
        omap3-beagle-xm.dtb \
        omap3-evm.dtb \
 +      omap3-evm-37xx.dtb \
 +      omap3-n900.dtb \
 +      omap3-n9.dtb \
 +      omap3-n950.dtb \
        omap3-tobi.dtb \
 +      omap3-gta04.dtb \
        omap3-igep0020.dtb \
        omap3-igep0030.dtb \
 +      omap3-zoom3.dtb \
        omap4-panda.dtb \
        omap4-panda-a4.dtb \
        omap4-panda-es.dtb \
@@@ -193,24 -183,17 +193,24 @@@
        am335x-evm.dtb \
        am335x-evmsk.dtb \
        am335x-bone.dtb \
 +      am335x-boneblack.dtb \
 +      am335x-base0033.dtb \
        am3517-evm.dtb \
        am3517_mt_ventoux.dtb \
 -      am43x-epos-evm.dtb
 +      am43x-epos-evm.dtb \
 +      dra7-evm.dtb
  dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
  dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 -      ste-hrefprev60.dtb \
 -      ste-hrefv60plus.dtb \
 +      ste-hrefprev60-stuib.dtb \
 +      ste-hrefprev60-tvk.dtb \
 +      ste-hrefv60plus-stuib.dtb \
 +      ste-hrefv60plus-tvk.dtb \
        ste-ccu8540.dtb \
        ste-ccu9540.dtb
  dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
 +dtb-$(CONFIG_ARCH_S3C64XX) += s3c6410-mini6410.dtb \
 +      s3c6410-smdk6410.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
        emev2-kzm9d-reference.dtb \
        r8a7740-armadillo800eva.dtb \
@@@ -227,9 -210,7 +227,9 @@@
        r8a73a4-ape6evm-reference.dtb \
        sh7372-mackerel.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.dtb
 -dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
 +dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
 +      socfpga_cyclone5_socdk.dtb \
 +      socfpga_cyclone5_sockit.dtb \
        socfpga_vt.dtb
  dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
        spear1340-evb.dtb
@@@ -251,6 -232,7 +251,7 @@@ dtb-$(CONFIG_ARCH_SUNXI) += 
        sun5i-a13-olinuxino.dtb \
        sun6i-a31-colombus.dtb \
        sun7i-a20-cubieboard2.dtb \
+       sun7i-a20-cubietruck.dtb \
        sun7i-a20-olinuxino-micro.dtb
  dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra20-iris-512.dtb \
@@@ -265,8 -247,7 +266,8 @@@
        tegra30-beaver.dtb \
        tegra30-cardhu-a02.dtb \
        tegra30-cardhu-a04.dtb \
 -      tegra114-dalmore.dtb
 +      tegra114-dalmore.dtb \
 +      tegra124-venice2.dtb
  dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \
        versatile-pb.dtb
  dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb