Skip to contentSkip to conversation

Patch "dts: imx53: fix sd card gpio polarity specified in device tree" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Oct 17, 2015

Subsystems (3)
Stable branch Device tree bindings Arm i.MX and Layerscape
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

dts: imx53: fix sd card gpio polarity specified in device tree

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
dts-imx53-fix-sd-card-gpio-polarity-specified-in-device-tree.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 94d76946859b4bcfa0da373357f14feda2af0622 Mon Sep 17 00:00:00 2001

From: Dong Aisheng <[email protected]>
Date: Wed, 22 Jul 2015 20:53:01 +0800
Subject: dts: imx53: fix sd card gpio polarity specified in device tree

From: Dong Aisheng <[email protected]>

commit 94d76946859b4bcfa0da373357f14feda2af0622 upstream.

cd-gpios polarity should be changed to GPIO_ACTIVE_LOW and wp-gpios should be changed to GPIO_ACTIVE_HIGH.
Otherwise, the SD may not work properly due to wrong polarity inversion specified in DT after switch to common parsing function mmc_of_parse().

Signed-off-by Dong Aisheng <[email protected]>
Acked-by Shawn Guo <[email protected]>
Signed-off-by Ulf Hansson <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 arch/arm/boot/dts/imx53-ard.dts         |    4 ++--
 arch/arm/boot/dts/imx53-m53evk.dts      |    4 ++--
 arch/arm/boot/dts/imx53-qsb-common.dtsi |    4 ++--
 arch/arm/boot/dts/imx53-smd.dts         |    4 ++--
 arch/arm/boot/dts/imx53-tqma53.dtsi     |    4 ++--
 arch/arm/boot/dts/imx53-tx53.dtsi       |    4 ++--
 arch/arm/boot/dts/imx53-voipac-bsb.dts  |    4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)
arch/arm/boot/dts/imx53-ard.dts +2 -2
@@ -103,8 +103,8 @@
 &esdhc1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_esdhc1>;
-	cd-gpios = <&gpio1 1 0>;
-	wp-gpios = <&gpio1 9 0>;
+	cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
+	wp-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
 	status = "okay";
 };
arch/arm/boot/dts/imx53-m53evk.dts +2 -2
@@ -124,8 +124,8 @@
 &esdhc1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_esdhc1>;
-	cd-gpios = <&gpio1 1 0>;
-	wp-gpios = <&gpio1 9 0>;
+	cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
+	wp-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
 	status = "okay";
 };
arch/arm/boot/dts/imx53-qsb-common.dtsi +2 -2
@@ -147,8 +147,8 @@
 &esdhc3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_esdhc3>;
-	cd-gpios = <&gpio3 11 0>;
-	wp-gpios = <&gpio3 12 0>;
+	cd-gpios = <&gpio3 11 GPIO_ACTIVE_LOW>;
+	wp-gpios = <&gpio3 12 GPIO_ACTIVE_HIGH>;
 	bus-width = <8>;
 	status = "okay";
 };
arch/arm/boot/dts/imx53-smd.dts +2 -2
@@ -41,8 +41,8 @@
 &esdhc1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_esdhc1>;
-	cd-gpios = <&gpio3 13 0>;
-	wp-gpios = <&gpio4 11 0>;
+	cd-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>;
+	wp-gpios = <&gpio4 11 GPIO_ACTIVE_HIGH>;
 	status = "okay";
 };
arch/arm/boot/dts/imx53-tqma53.dtsi +2 -2
@@ -41,8 +41,8 @@
 	pinctrl-0 = <&pinctrl_esdhc2>,
 		    <&pinctrl_esdhc2_cdwp>;
 	vmmc-supply = <&reg_3p3v>;
-	wp-gpios = <&gpio1 2 0>;
-	cd-gpios = <&gpio1 4 0>;
+	wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+	cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
 	status = "disabled";
 };
arch/arm/boot/dts/imx53-tx53.dtsi +2 -2
@@ -183,7 +183,7 @@
 };
 
 &esdhc1 {
-	cd-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>;
+	cd-gpios = <&gpio3 24 GPIO_ACTIVE_LOW>;
 	fsl,wp-controller;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_esdhc1>;

@@ -191,7 +191,7 @@
 };
 
 &esdhc2 {
-	cd-gpios = <&gpio3 25 GPIO_ACTIVE_HIGH>;
+	cd-gpios = <&gpio3 25 GPIO_ACTIVE_LOW>;
 	fsl,wp-controller;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_esdhc2>;
arch/arm/boot/dts/imx53-voipac-bsb.dts +2 -2
@@ -119,8 +119,8 @@
 &esdhc2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_esdhc2>;
-	cd-gpios = <&gpio3 25 0>;
-	wp-gpios = <&gpio2 19 0>;
+	cd-gpios = <&gpio3 25 GPIO_ACTIVE_LOW>;
+	wp-gpios = <&gpio2 19 GPIO_ACTIVE_HIGH>;
 	vmmc-supply = <&reg_3p3v>;
 	status = "okay";
 };

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/dts-imx51-fix-sd-card-gpio-polarity-specified-in-device-tree.patch queue-4.1/dts-imx6-fix-sd-card-gpio-polarity-specified-in-device-tree.patch queue-4.1/dts-imx25-fix-sd-card-gpio-polarity-specified-in-device-tree.patch queue-4.1/dts-imx53-fix-sd-card-gpio-polarity-specified-in-device-tree.patch queue-4.1/mmc-sdhci-esdhc-imx-fix-cd-regression-for-dt-platform.patch