Merge branch 'next/dt' into for-next

* next/dt:
  ARM: ux500: move BU21013 touchpad GPIOs into top-level DTS
  ARM: ux500: register the tc35892 GPIO on the TVK UIB
  ARM: ux500: split the HREF DTS files from two to four
  ARM: ux500: split HREF UIB files
  ARM: ux500: move TC35892 at 0x42 to hrefprev60
  ARM: ux500: correct CD for micro SD on hrev60plus
  ARM: ux500: fix proximity sensor button
  ARM: ux500: correct I2C address of ambient light sensor
  ARM: ux500 enable the AB8500 gpio for all HREFs
  ARM: ux500: add default trigger on HREF LED

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

diff --combined arch/arm/arm-soc-for-next-contents.txt
index bbc1d4c005a8e72f996abe06f542df2e95ce12b0,0000000000000000000000000000000000000000..5edba823f7bbedf2b826648cfc2bbdec49d2098d
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,25 -1,0 +1,27 @@@
 +
 +
 +next/cleanup
 +      shark/removal
 +                git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/del-shark-for-v3.13
 +      cleanup/dt-clock
 +              https://github.com/shesselba/linux-dove.git clk-of-init-v2_for-3.13
 +
 +next/soc
 +      samsung/s3c64xx-clk
 +              http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-clk-s3c64xx
 +      patch
 +              ARM: davinci: remove deprecated IRQF_DISABLED
 +
 +next/drivers
 +      davinci/gpio
 +              git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.13/gpio
 +
 +next/dt
 +      samsung/s3c64xx-dt
 +                http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt-s3c64xx
 +      ux500/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-for-v3.13-2
 +              patch "ARM: ux500: enable appended dtb in u8500_defconfig"
++      ux500/dt2
++              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-devicetree-2
 +

diff --combined arch/arm/boot/dts/Makefile
index 58a360ca0f3f5d5d4f2c15051f5afdc4c9063931,a5534c0e71efd07b902057e53914197bb2adfc50..663d302d0602e60a02d014076ab857b9a0745b66
--- 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
@@@ -192,8 -190,10 +192,10 @@@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap242
  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