summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelmut Klein <hgkr.klein@gmail.com>2015-11-11 15:03:04 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-25 11:58:54 -0800
commitc4e671dff168c14379301ef13366eeb85d65acab (patch)
tree89dcb6ae800714cd8a3a56a7a57d269bcbfb5b00
parente69363be78149c40df4b19f3c98c560886c070d6 (diff)
downloadlwn-c4e671dff168c14379301ef13366eeb85d65acab.tar.gz
lwn-c4e671dff168c14379301ef13366eeb85d65acab.zip
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/boot/dts/kirkwood-ts219.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 911f3a8cee23..f4227da77265 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -47,7 +47,7 @@
};
poweroff@12100 {
compatible = "qnap,power-off";
- reg = <0x12000 0x100>;
+ reg = <0x12100 0x100>;
clocks = <&gate_clk 7>;
};
spi@10600 {