]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ARM: dts: Kirkwood: Fix QNAP TS219 power-off
authorHelmut Klein <hgkr.klein@gmail.com>
Wed, 11 Nov 2015 14:03:04 +0000 (15:03 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Feb 2016 19:58:54 +0000 (11:58 -0800)
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>
arch/arm/boot/dts/kirkwood-ts219.dtsi

index 911f3a8cee23ec0d5d28f07451338147eeb01893..f4227da7726505ef8f18fed0386b154251fc1e3c 100644 (file)
@@ -47,7 +47,7 @@
                };
                poweroff@12100 {
                        compatible = "qnap,power-off";
-                       reg = <0x12000 0x100>;
+                       reg = <0x12100 0x100>;
                        clocks = <&gate_clk 7>;
                };
                spi@10600 {