diff options
author | Dong Aisheng <aisheng.dong@freescale.com> | 2015-07-22 08:53:01 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-07-24 04:18:35 -0400 |
commit | 94d76946859b4bcfa0da373357f14feda2af0622 (patch) | |
tree | acb825c3e771216b08dc68fa8805a13964d42507 /arch | |
parent | aca45c0e95dad1c4ba4d38da192756b0e10cbbbd (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/imx53-ard.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-m53evk.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-qsb-common.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-smd.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-tqma53.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-tx53.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53-voipac-bsb.dts | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/imx53-ard.dts b/arch/arm/boot/dts/imx53-ard.dts index e9337ad52f59..3bc18835fb4b 100644 --- a/arch/arm/boot/dts/imx53-ard.dts +++ b/arch/arm/boot/dts/imx53-ard.dts | |||
@@ -103,8 +103,8 @@ | |||
103 | &esdhc1 { | 103 | &esdhc1 { |
104 | pinctrl-names = "default"; | 104 | pinctrl-names = "default"; |
105 | pinctrl-0 = <&pinctrl_esdhc1>; | 105 | pinctrl-0 = <&pinctrl_esdhc1>; |
106 | cd-gpios = <&gpio1 1 0>; | 106 | cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; |
107 | wp-gpios = <&gpio1 9 0>; | 107 | wp-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; |
108 | status = "okay"; | 108 | status = "okay"; |
109 | }; | 109 | }; |
110 | 110 | ||
diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts index d0e0f57eb432..53f40885c530 100644 --- a/arch/arm/boot/dts/imx53-m53evk.dts +++ b/arch/arm/boot/dts/imx53-m53evk.dts | |||
@@ -124,8 +124,8 @@ | |||
124 | &esdhc1 { | 124 | &esdhc1 { |
125 | pinctrl-names = "default"; | 125 | pinctrl-names = "default"; |
126 | pinctrl-0 = <&pinctrl_esdhc1>; | 126 | pinctrl-0 = <&pinctrl_esdhc1>; |
127 | cd-gpios = <&gpio1 1 0>; | 127 | cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; |
128 | wp-gpios = <&gpio1 9 0>; | 128 | wp-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; |
129 | status = "okay"; | 129 | status = "okay"; |
130 | }; | 130 | }; |
131 | 131 | ||
diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi index ab4ba39f2ed9..b0d5542ac829 100644 --- a/arch/arm/boot/dts/imx53-qsb-common.dtsi +++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi | |||
@@ -147,8 +147,8 @@ | |||
147 | &esdhc3 { | 147 | &esdhc3 { |
148 | pinctrl-names = "default"; | 148 | pinctrl-names = "default"; |
149 | pinctrl-0 = <&pinctrl_esdhc3>; | 149 | pinctrl-0 = <&pinctrl_esdhc3>; |
150 | cd-gpios = <&gpio3 11 0>; | 150 | cd-gpios = <&gpio3 11 GPIO_ACTIVE_LOW>; |
151 | wp-gpios = <&gpio3 12 0>; | 151 | wp-gpios = <&gpio3 12 GPIO_ACTIVE_HIGH>; |
152 | bus-width = <8>; | 152 | bus-width = <8>; |
153 | status = "okay"; | 153 | status = "okay"; |
154 | }; | 154 | }; |
diff --git a/arch/arm/boot/dts/imx53-smd.dts b/arch/arm/boot/dts/imx53-smd.dts index 1d325576bcc0..fc89ce1e5763 100644 --- a/arch/arm/boot/dts/imx53-smd.dts +++ b/arch/arm/boot/dts/imx53-smd.dts | |||
@@ -41,8 +41,8 @@ | |||
41 | &esdhc1 { | 41 | &esdhc1 { |
42 | pinctrl-names = "default"; | 42 | pinctrl-names = "default"; |
43 | pinctrl-0 = <&pinctrl_esdhc1>; | 43 | pinctrl-0 = <&pinctrl_esdhc1>; |
44 | cd-gpios = <&gpio3 13 0>; | 44 | cd-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>; |
45 | wp-gpios = <&gpio4 11 0>; | 45 | wp-gpios = <&gpio4 11 GPIO_ACTIVE_HIGH>; |
46 | status = "okay"; | 46 | status = "okay"; |
47 | }; | 47 | }; |
48 | 48 | ||
diff --git a/arch/arm/boot/dts/imx53-tqma53.dtsi b/arch/arm/boot/dts/imx53-tqma53.dtsi index 4f1f0e2868bf..e03373a58760 100644 --- a/arch/arm/boot/dts/imx53-tqma53.dtsi +++ b/arch/arm/boot/dts/imx53-tqma53.dtsi | |||
@@ -41,8 +41,8 @@ | |||
41 | pinctrl-0 = <&pinctrl_esdhc2>, | 41 | pinctrl-0 = <&pinctrl_esdhc2>, |
42 | <&pinctrl_esdhc2_cdwp>; | 42 | <&pinctrl_esdhc2_cdwp>; |
43 | vmmc-supply = <®_3p3v>; | 43 | vmmc-supply = <®_3p3v>; |
44 | wp-gpios = <&gpio1 2 0>; | 44 | wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; |
45 | cd-gpios = <&gpio1 4 0>; | 45 | cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; |
46 | status = "disabled"; | 46 | status = "disabled"; |
47 | }; | 47 | }; |
48 | 48 | ||
diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi index 704bd72cbfec..d3e50b22064f 100644 --- a/arch/arm/boot/dts/imx53-tx53.dtsi +++ b/arch/arm/boot/dts/imx53-tx53.dtsi | |||
@@ -183,7 +183,7 @@ | |||
183 | }; | 183 | }; |
184 | 184 | ||
185 | &esdhc1 { | 185 | &esdhc1 { |
186 | cd-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>; | 186 | cd-gpios = <&gpio3 24 GPIO_ACTIVE_LOW>; |
187 | fsl,wp-controller; | 187 | fsl,wp-controller; |
188 | pinctrl-names = "default"; | 188 | pinctrl-names = "default"; |
189 | pinctrl-0 = <&pinctrl_esdhc1>; | 189 | pinctrl-0 = <&pinctrl_esdhc1>; |
@@ -191,7 +191,7 @@ | |||
191 | }; | 191 | }; |
192 | 192 | ||
193 | &esdhc2 { | 193 | &esdhc2 { |
194 | cd-gpios = <&gpio3 25 GPIO_ACTIVE_HIGH>; | 194 | cd-gpios = <&gpio3 25 GPIO_ACTIVE_LOW>; |
195 | fsl,wp-controller; | 195 | fsl,wp-controller; |
196 | pinctrl-names = "default"; | 196 | pinctrl-names = "default"; |
197 | pinctrl-0 = <&pinctrl_esdhc2>; | 197 | pinctrl-0 = <&pinctrl_esdhc2>; |
diff --git a/arch/arm/boot/dts/imx53-voipac-bsb.dts b/arch/arm/boot/dts/imx53-voipac-bsb.dts index c17d3ad6dba5..fc51b87ad208 100644 --- a/arch/arm/boot/dts/imx53-voipac-bsb.dts +++ b/arch/arm/boot/dts/imx53-voipac-bsb.dts | |||
@@ -119,8 +119,8 @@ | |||
119 | &esdhc2 { | 119 | &esdhc2 { |
120 | pinctrl-names = "default"; | 120 | pinctrl-names = "default"; |
121 | pinctrl-0 = <&pinctrl_esdhc2>; | 121 | pinctrl-0 = <&pinctrl_esdhc2>; |
122 | cd-gpios = <&gpio3 25 0>; | 122 | cd-gpios = <&gpio3 25 GPIO_ACTIVE_LOW>; |
123 | wp-gpios = <&gpio2 19 0>; | 123 | wp-gpios = <&gpio2 19 GPIO_ACTIVE_HIGH>; |
124 | vmmc-supply = <®_3p3v>; | 124 | vmmc-supply = <®_3p3v>; |
125 | status = "okay"; | 125 | status = "okay"; |
126 | }; | 126 | }; |