Merge tag 'boards-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/boards

From Jason Cooper, mvebu board changes for v3.11.

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

* tag 'boards-3.11-2' of git://git.infradead.org/users/jcooper/linux:
  ARM: Kirkwood: Convert LSXL to restart-poweroff driver.
  ARM: Kirkwood: Make use of the QNAP Power off driver.
  ARM: Kirkwood: add DT support for Sheevaplug and Sheevaplug eSATA

2 files changed, 9 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 37d45c4f88fb..996c7fefd253 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -172,6 +172,10 @@
                 alarm-gpios = <&gpio1 8 0>;
         };
 
+        restart_poweroff {
+                compatible = "restart-poweroff";
+        };
+
         regulators {
                 compatible = "simple-bus";
                 #address-cells = <1>;
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 64ea27cb3298..4e29460baf04 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -31,6 +31,11 @@
                         clock-frequency = <200000000>;
                         status = "okay";
                 };
+                poweroff@12100 {
+                        compatible = "qnap,power-off";
+                        reg = <0x12000 0x100>;
+                        clocks = <&gate_clk 7>;
+                };
                 spi@10600 {
                         status = "okay";