Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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 <aisheng.dong@freescale.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Dong Aisheng and committed by
Ulf Hansson
94d76946 aca45c0e

+14 -14
+2 -2
arch/arm/boot/dts/imx53-ard.dts
··· 103 103 &esdhc1 { 104 104 pinctrl-names = "default"; 105 105 pinctrl-0 = <&pinctrl_esdhc1>; 106 - cd-gpios = <&gpio1 1 0>; 107 - wp-gpios = <&gpio1 9 0>; 106 + cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; 107 + wp-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; 108 108 status = "okay"; 109 109 }; 110 110
+2 -2
arch/arm/boot/dts/imx53-m53evk.dts
··· 124 124 &esdhc1 { 125 125 pinctrl-names = "default"; 126 126 pinctrl-0 = <&pinctrl_esdhc1>; 127 - cd-gpios = <&gpio1 1 0>; 128 - wp-gpios = <&gpio1 9 0>; 127 + cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; 128 + wp-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; 129 129 status = "okay"; 130 130 }; 131 131
+2 -2
arch/arm/boot/dts/imx53-qsb-common.dtsi
··· 147 147 &esdhc3 { 148 148 pinctrl-names = "default"; 149 149 pinctrl-0 = <&pinctrl_esdhc3>; 150 - cd-gpios = <&gpio3 11 0>; 151 - wp-gpios = <&gpio3 12 0>; 150 + cd-gpios = <&gpio3 11 GPIO_ACTIVE_LOW>; 151 + wp-gpios = <&gpio3 12 GPIO_ACTIVE_HIGH>; 152 152 bus-width = <8>; 153 153 status = "okay"; 154 154 };
+2 -2
arch/arm/boot/dts/imx53-smd.dts
··· 41 41 &esdhc1 { 42 42 pinctrl-names = "default"; 43 43 pinctrl-0 = <&pinctrl_esdhc1>; 44 - cd-gpios = <&gpio3 13 0>; 45 - wp-gpios = <&gpio4 11 0>; 44 + cd-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>; 45 + wp-gpios = <&gpio4 11 GPIO_ACTIVE_HIGH>; 46 46 status = "okay"; 47 47 }; 48 48
+2 -2
arch/arm/boot/dts/imx53-tqma53.dtsi
··· 41 41 pinctrl-0 = <&pinctrl_esdhc2>, 42 42 <&pinctrl_esdhc2_cdwp>; 43 43 vmmc-supply = <&reg_3p3v>; 44 - wp-gpios = <&gpio1 2 0>; 45 - cd-gpios = <&gpio1 4 0>; 44 + wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; 45 + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; 46 46 status = "disabled"; 47 47 }; 48 48
+2 -2
arch/arm/boot/dts/imx53-tx53.dtsi
··· 183 183 }; 184 184 185 185 &esdhc1 { 186 - cd-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>; 186 + cd-gpios = <&gpio3 24 GPIO_ACTIVE_LOW>; 187 187 fsl,wp-controller; 188 188 pinctrl-names = "default"; 189 189 pinctrl-0 = <&pinctrl_esdhc1>; ··· 191 191 }; 192 192 193 193 &esdhc2 { 194 - cd-gpios = <&gpio3 25 GPIO_ACTIVE_HIGH>; 194 + cd-gpios = <&gpio3 25 GPIO_ACTIVE_LOW>; 195 195 fsl,wp-controller; 196 196 pinctrl-names = "default"; 197 197 pinctrl-0 = <&pinctrl_esdhc2>;
+2 -2
arch/arm/boot/dts/imx53-voipac-bsb.dts
··· 119 119 &esdhc2 { 120 120 pinctrl-names = "default"; 121 121 pinctrl-0 = <&pinctrl_esdhc2>; 122 - cd-gpios = <&gpio3 25 0>; 123 - wp-gpios = <&gpio2 19 0>; 122 + cd-gpios = <&gpio3 25 GPIO_ACTIVE_LOW>; 123 + wp-gpios = <&gpio2 19 GPIO_ACTIVE_HIGH>; 124 124 vmmc-supply = <&reg_3p3v>; 125 125 status = "okay"; 126 126 };