From d89f74a7bada999e5c5b8ac45a78338f315c96bf Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 11 Dec 2015 18:36:54 +0000 Subject: [PATCH] [armel/kirkwood] dts: Fix QNAP TS219 power-off (Closes: #807696) --- debian/changelog | 1 + ...ts-kirkwood-fix-qnap-ts219-power-off.patch | 31 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 33 insertions(+) create mode 100644 debian/patches/bugfix/arm/arm-dts-kirkwood-fix-qnap-ts219-power-off.patch diff --git a/debian/changelog b/debian/changelog index 8d10d9517..58cdd9895 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ linux (4.3.1-1~exp1) UNRELEASED; urgency=medium * [armhf] Enable MACH_ARMADA_375, MACH_ARMADA_38X, MACH_ARMADA_39X (Closes: #807633) * [armhf] net: Enable MVPP2 as module + * [armel/kirkwood] dts: Fix QNAP TS219 power-off (Closes: #807696) -- Ben Hutchings Wed, 09 Dec 2015 23:20:32 +0000 diff --git a/debian/patches/bugfix/arm/arm-dts-kirkwood-fix-qnap-ts219-power-off.patch b/debian/patches/bugfix/arm/arm-dts-kirkwood-fix-qnap-ts219-power-off.patch new file mode 100644 index 000000000..76ebec98f --- /dev/null +++ b/debian/patches/bugfix/arm/arm-dts-kirkwood-fix-qnap-ts219-power-off.patch @@ -0,0 +1,31 @@ +From: Helmut Klein +Date: Wed, 11 Nov 2015 15:03:04 +0100 +Subject: ARM: dts: Kirkwood: Fix QNAP TS219 power-off +Origin: https://git.kernel.org/linus/5442f0eadf2885453d5b2ed8c8592f32a3744f8e + +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 +Signed-off-by: Andrew Lunn +Fixes: 4350a47bbac3 ("ARM: Kirkwood: Make use of the QNAP Power off driver.") +Signed-off-by: Gregory CLEMENT +--- + arch/arm/boot/dts/kirkwood-ts219.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi +index c56ab6b..0e46560 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 { diff --git a/debian/patches/series b/debian/patches/series index 7c917d70b..d18da730c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -96,3 +96,4 @@ bugfix/all/isdn_ppp-add-checks-for-allocation-failure-in-isdn_p.patch bugfix/all/ppp-slip-validate-vj-compression-slot-parameters-com.patch bugfix/all/btrfs-fix-truncation-of-compressed-and-inlined-exten.patch bugfix/x86/drm-i915-shut-up-gen8-sde-irq-dmesg-noise.patch +bugfix/arm/arm-dts-kirkwood-fix-qnap-ts219-power-off.patch