Merge branch 'next/dt' into for-next

* next/dt:
  ARM: Kirkwood: ts219: Enable second PCIe port in DT.
  ARM: mvebu: Remove device tree unused properties on A370
  arm: mvebu: armada-xp-db: ensure PCIe range is specified
  arm: kirkwood: sheevaplug: move pinmux configs to the right devices
  ARM: mvebu: set aliases for ethernet controllers

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

diff --cc arch/arm/arm-soc-for-next-contents.txt
index c62304ad2dfb667171b254de6c7d74ee9e71e470,0000000000000000000000000000000000000000..a2a3d5c3b3566e22af3c826ff2128d5d2c9d6edd
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,144 -1,0 +1,146 @@@
 +for-next contents for 3.11: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +      <topic branch>
 +              <contents>
 +              <...>
 +      <...>
 +
 +depends/rmk-devel-stable
 +      http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git devel-stable
 +
 +next/fixes-non-critical
 +      mvebu/fixes-non-critical
 +              git://git.infradead.org/users/jcooper/linux.git tags/fixes-non-3.11-1
 +      sirf/fixes-non-critical
 +              git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git tags/sirf-arm-soc-v3.10-fixes
 +      omap/fixes-non-critical
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/fixes-non-critical-signed           
 +
 +
 +next/cleanup
 +      at91/cleanup
 +              git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 +      machdesc/cleanup
 +              git://github.com/mripard/linux.git tags/arm-soc-cleanups-for-3.11
 +      mvebu/cleanup
 +              git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-3
 +      dt/pci-helpers
 +              git://git.infradead.org/users/jcooper/linux.git tags/of_pci-3.11
 +      omap/cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/cleanup-signed
 +      mvebu/cleanup4
 +              git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-4
 +
 +next/soc
 +      mvebu/soc
 +              git://git.infradead.org/users/jcooper/linux.git tags/soc-3.11-2
 +      mvebu/defconfig
 +              git://git.infradead.org/users/jcooper/linux.git tags/defconfig-3.11-3
 +      mvebu/pcie
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie-3.11-2
 +      mvebu/pcie-kirkwood
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11
 +      mvebu/pcie2
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_bridge-3.11
 +      mvebu/clk-cleanup
 +              git://git.infradead.org/users/jcooper/linux.git tags/seb_clk-3.11
 +      vexpress/dual-cluster
 +              git://git.linaro.org/people/nico/linux VExpress_DCSCB
 +              depends on depends/rmk-devel-stable
 +              +patch "drivers/bus: arm-cci: fix combined ARMv6+v7 build"
 +      zynq/clk
 +              git://git.xilinx.com/linux-xlnx tags/zynq-clk-for-3.11
 +      mvebu/pcie-kirkwood2
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11-2
 +      renesas/pinmux-gpio
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-pinmux-for-v3.11
 +      renesas/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11
 +      clps711x/soc
 +              patches
 +                      GPIO: clps711x: Rewrite driver for using generic GPIO cod
 +                      GPIO: clps711x: Add DT support
 +                      ARM: clps711x: Re-add GPIO support
 +                      ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency
 +                      ARM: clps711x: Set PLL clock to zero if we work from 13 mHz sourc
 +                      ARM: clps711x: autcpu12: Move LCD DPOT definitions to board file
 +                      ARM: clps711x: autcpu12: Add support for NOR flash
 +                      ARM: clps711x: autcpu12: Special driver for handling memory is re
 +                      ARM: clps711x: autcpu12: Move remaining specific definitions to b
 +                      ARM: clps711x: p720t: Define PLD registers as GPIOs
 +                      ARM: clps711x: Move specific definitions from hardware.h to board
 +                      ARM: clps711x: Replace "arch_initcall" in common code with ".init
 +                      ARM: clps711x: Add clocksource framework
 +                      ARM: clps711x: Optimize interrupt handling
 +                      ARM: clps711x: edb7211: Add support for I2C
 +                      ARM: clps711x: edb7211: Control LCD backlight via PWM
 +                      ARM: clps711x: Add support for SYSCON driver
 +                      ARM: clps711x: Update defconfig
 +      patches
 +              ARM: socfpga: Add support to gate peripheral clocks
 +              ARM: socfpga: Add syscon to be part of socfpga
 +      samsung/s3c24xx-arch
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-arch-1
 +      omap/pm
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/pm-signed
 +      omap/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed
 +      omap/omap5
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/soc-signed
 +
 +next/boards
 +      mvebu/boards
 +                git://git.infradead.org/users/jcooper/linux.git tags/boards-3.11-2
 +      renesas/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.11
 +      renesas/boards
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-for-v3.11
 +              depends on renesas/pinmux-gpio
 +              depends on renesas/soc
 +
 +next/dt
 +      nomadik/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-for-arm-soc
 +      mvebu/dt
 +              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-3
 +      patch
 +              "ARM: nomadik: fix clocksource warning"
 +      at91/dt
 +              git://github.com/at91linux/linux-at91.git tags/at91-dt
 +      vt8500/dt
 +              git://github.com/linux-wmt/linux-vtwm vt8500/dts-3.11
 +      cleanup/dts-cpus
 +              git://linux-arm.org/linux-2.6-lp dts-cpus-updates
 +      patch
 +              "ARM: dts: add missing cpu #address-cell values"
 +      mvebu/dt4
 +              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-4
 +      renesas/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.11
 +      patches
 +              ARM: socfpga: dts: Add ethernet bindings for SOCFPGA
 +              ARM: socfpga: dts: Add gate-clock bindings
 +      samsung/s3c24xx-dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-dt-1
 +      samsung/exynos-dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/exynos-dt-1
++      mvebu/dt5
++              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-5
 +
 +next/drivers
 +      ux500/dma40
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc
 +      timer/dw_apb_timer_of
 +              git://github.com/mmind/linux-rockchip.git tags/dw_apb_timer_of
 +      samsung/s3c24xx-drivers
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-driver-1
 +      omap/gpmc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed
 +
 +next/mailbox:
 +      mailbox/subsystem
 +              git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox
 +
 +

diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
index 00a263799bc9b92bb788cc76dba746fbdbdbeb92,a679b6697a981c69b962784a752a128166fb7769..90b117624abb2230105855b70fbdf313fa73a05e
--- 1/arch/arm/boot/dts/armada-370-xp.dtsi
--- 2/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@@ -98,17 -103,17 +103,17 @@@
                                reg = <0x72004 0x4>;
                        };
  
-                       ethernet@70000 {
+                       eth0: ethernet@70000 {
                                compatible = "marvell,armada-370-neta";
 -                              reg = <0x70000 0x2500>;
 +                              reg = <0x70000 0x4000>;
                                interrupts = <8>;
                                clocks = <&gateclk 4>;
                                status = "disabled";
                        };
  
-                       ethernet@74000 {
+                       eth1: ethernet@74000 {
                                compatible = "marvell,armada-370-neta";
 -                              reg = <0x74000 0x2500>;
 +                              reg = <0x74000 0x4000>;
                                interrupts = <10>;
                                clocks = <&gateclk 3>;
                                status = "disabled";

diff --cc arch/arm/boot/dts/armada-xp-mv78460.dtsi
index 488ca5eb9a55fa646df8771c56dec7f5b224202f,386f0ce48453361aaceede735d9bf4acf6cfeb6a..c7b1f4d5c1c76f9c2ef710b00190c7080ef1829c
--- 1/arch/arm/boot/dts/armada-xp-mv78460.dtsi
--- 2/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@@ -105,9 -106,9 +106,9 @@@
                                interrupts = <91>;
                        };
  
-                       ethernet@34000 {
+                       eth3: ethernet@34000 {
                                compatible = "marvell,armada-370-neta";
 -                              reg = <0x34000 0x2500>;
 +                              reg = <0x34000 0x4000>;
                                interrupts = <14>;
                                clocks = <&gateclk 1>;
                                status = "disabled";

diff --cc arch/arm/boot/dts/armada-xp.dtsi
index 1ee8540b0ebaf516d940ca020473e21b2fa964ba,e481d54b565cf8296a103c73d79439a06b7e4cd9..416eb94818449c7d2ff78ecae2e453be614e6830
--- 1/arch/arm/boot/dts/armada-xp.dtsi
--- 2/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@@ -86,9 -90,9 +90,9 @@@
                                reg = <0x18200 0x500>;
                        };
  
-                       ethernet@30000 {
+                       eth2: ethernet@30000 {
                                compatible = "marvell,armada-370-neta";
 -                              reg = <0x30000 0x2500>;
 +                              reg = <0x30000 0x4000>;
                                interrupts = <12>;
                                clocks = <&gateclk 2>;
                                status = "disabled";

diff --cc arch/arm/boot/dts/kirkwood-ts219-6282.dts
Simple merge