From: Helmut Klein <hgkr.klein@gmail.com>
Date: Wed, 11 Nov 2015 14:03:04 +0000 (+0100)
Subject: ARM: dts: Kirkwood: Fix QNAP TS219 power-off
X-Git-Tag: v3.16.35~864
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5313c72b6d4efa3b64a11d2d88ff45d7f3baa2f;p=thirdparty%2Fkernel%2Fstable.git

ARM: dts: Kirkwood: Fix QNAP TS219 power-off

commit 5442f0eadf2885453d5b2ed8c8592f32a3744f8e upstream.

The "reg" entry in the "poweroff" section of "kirkwood-ts219.dtsi"
addressed the wrong uart (0 = console). This patch changes the address
to select uart 1, which is the uart connected to the pic
microcontroller, which can switch the device off.

Signed-off-by: Helmut Klein <hgkr.klein@gmail.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Fixes: 4350a47bbac3 ("ARM: Kirkwood: Make use of the QNAP Power off driver.")
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index df7f15276575a..8e15b36c1beb1 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -40,7 +40,7 @@
 		};
 		poweroff@12100 {
 			compatible = "qnap,power-off";
-			reg = <0x12000 0x100>;
+			reg = <0x12100 0x100>;
 			clocks = <&gate_clk 7>;
 		};
 		spi@10600 {