[linux] 02/03: [armel/marvell] dts: kirkwood: fix SD slot default configuration for OpenRD (Closes: #811351)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit b20f5e22b0842124b11d22be79476dd9ec7e9a06
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Apr 22 08:06:49 2016 +0100

    [armel/marvell] dts: kirkwood: fix SD slot default configuration for OpenRD (Closes: #811351)
---
 debian/changelog                                   |  2 ++
 ...kwood-fix-sd-slot-default-configuration-f.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3b98c3f..317904c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,6 +109,8 @@ linux (4.5.2-1) UNRELEASED; urgency=medium
   [ Ben Hutchings ]
   * fs: Consolidate softdep declarations in each module
   * Bump ABI to 2
+  * [armel/marvell] dts: kirkwood: fix SD slot default configuration for OpenRD
+    (Closes: #811351)
 
   [ Aurelien Jarno ]
   * [mips*] Emulate unaligned LDXC1 and SDXC1 instructions.
diff --git a/debian/patches/bugfix/arm/arm-dts-kirkwood-fix-sd-slot-default-configuration-f.patch b/debian/patches/bugfix/arm/arm-dts-kirkwood-fix-sd-slot-default-configuration-f.patch
new file mode 100644
index 0000000..631143c
--- /dev/null
+++ b/debian/patches/bugfix/arm/arm-dts-kirkwood-fix-sd-slot-default-configuration-f.patch
@@ -0,0 +1,35 @@
+From: Aaro Koskinen <aaro.koskinen at iki.fi>
+Date: Tue, 12 Jan 2016 22:07:33 +0200
+Subject: ARM: dts: kirkwood: fix SD slot default configuration for OpenRD
+Origin: https://git.kernel.org/linus/28c494d0c5b7e0993d067086b26c901ae23d3841
+
+The SD card slot was enabled by default with legacy booting.
+It does not work anymore with DT boot. Fix by providing GPIO configuration
+that matches the old default.
+
+Signed-off-by: Aaro Koskinen <aaro.koskinen at iki.fi>
+Reviewed-by: Andrew Lunn <andrew at lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
+---
+ arch/arm/boot/dts/kirkwood-openrd.dtsi | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/arch/arm/boot/dts/kirkwood-openrd.dtsi b/arch/arm/boot/dts/kirkwood-openrd.dtsi
+index 2a3dafdab09a..f65b7273bb0a 100644
+--- a/arch/arm/boot/dts/kirkwood-openrd.dtsi
++++ b/arch/arm/boot/dts/kirkwood-openrd.dtsi
+@@ -65,6 +65,14 @@
+ 			status = "okay";
+ 			cd-gpios = <&gpio0 29 9>;
+ 		};
++		gpio at 10140 {
++			p2 {
++				gpio-hog;
++				gpios = <2 GPIO_ACTIVE_HIGH>;
++				output-high; /* Select SD by default */
++				line-name = "SelUARTorSD";
++			};
++		};
+ 	};
+ };
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7448d37..1557bb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -147,3 +147,4 @@ bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch
 bugfix/all/power-cpupower-fix-manpages-NAME.patch
 bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch
 bugfix/all/scripts-fix-x.509-pem-support-in-sign-file.patch
+bugfix/arm/arm-dts-kirkwood-fix-sd-slot-default-configuration-f.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git