Merge branch 'next/dt' into for-next

* next/dt: (27 commits)
  arm: kirkwood: openblocks-a6: add support for Init button
  arm: kirkwood: openblocks-a6: group pinmux configurations
  arm: kirkwood: ts219: move pinmux configs to the right devices
  arm: kirkwood: topkick: move pinmux configs to the right devices
  arm: kirkwood: openblocks_a6: move pinmux configs to the right devices
  arm: kirkwood: nsa310: move pinmux configs to the right devices
  arm: kirkwood: readynas: move pinmux configs to the right devices
  arm: kirkwood: mplcec4: move pinmux configs to the right devices
  arm: kirkwood: buffalo linkstation: move pinmux configs to the right devices
  arm: kirkwood: keymile: move pinmux configs to the right devices
  arm: kirkwood: ns2: move pinmux configs to the right devices
  arm: kirkwood: iomega ix2-200: move pinmux configs to the right devices
  arm: kirkwood: iconnect: move pinmux configs to the right devices
  arm: kirkwood: iconnect: give meaningful names to pinmux configs
  arm: kirkwood: ib62x0: move pinmux configs to the right devices
  arm: kirkwood: guruplug: move pinmux configs to the right devices
  arm: kirkwood: goflexnet: move pinmux configs to the right devices
  arm: kirkwood: dreamplug: move pinmux configs to the right devices
  arm: kirkwood: dockstar: move pinmux configs to the right devices
  arm: kirkwood: dlink dns: move pinmux configs to the right devices
  ...

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

diff --cc arch/arm/arm-soc-for-next-contents.txt
index 41d7022a248d0f4851787376b1469c5fce34e472,0000000000000000000000000000000000000000..9d84538510178050945832447024795df44b098d
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,45 -1,0 +1,47 @@@
 +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>
 +              <...>
 +      <...>
 +
 +next/fixes-non-critical
 +      mvebu/fixes-non-critical
 +              git://git.infradead.org/users/jcooper/linux.git tags/fixes-non-3.11-1
 +
 +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
 +
 +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
 +
 +next/boards
 +      mvebu/boards
 +                git://git.infradead.org/users/jcooper/linux.git tags/boards-3.11-2
 +
 +
 +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
 +
 +next/drivers
 +      ux500/dma40
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc
 +
 +next/mailbox:
 +      mailbox/subsystem
 +              git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox
 +
 +

diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-lsxl.dtsi
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-ts219.dtsi
index 4e29460baf040bfa881fdcef4503423848d657dc,b9325d45be78a732c9f3bef765661b4046c09f9b..47fb41bc34122f96e4b28b356203e38f0bd7d24b
--- 1/arch/arm/boot/dts/kirkwood-ts219.dtsi
--- 2/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@@ -30,14 -34,13 +34,18 @@@
                serial@12100 {
                        clock-frequency = <200000000>;
                        status = "okay";
+                       pinctrl-0 = <&pmx_uart1>;
+                       pinctrl-names = "default";
                };
 +              poweroff@12100 {
 +                      compatible = "qnap,power-off";
 +                      reg = <0x12000 0x100>;
 +                      clocks = <&gate_clk 7>;
 +              };
                spi@10600 {
                        status = "okay";
+                       pinctrl-0 = <&pmx_spi>;
+                       pinctrl-names = "default";
  
                        m25p128@0 {
                                #address-cells = <1>;