diff options
author | Dong Aisheng <aisheng.dong@freescale.com> | 2015-07-22 08:53:02 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-07-24 04:18:35 -0400 |
commit | 89c1a8cf63f8c69dfddb6e377c04df8b25ab1c88 (patch) | |
tree | fa7620ee030b41a59501d6d92859e8393ebe5747 | |
parent | 94d76946859b4bcfa0da373357f14feda2af0622 (diff) |
dts: imx6: 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>
23 files changed, 55 insertions, 49 deletions
diff --git a/arch/arm/boot/dts/imx6dl-riotboard.dts b/arch/arm/boot/dts/imx6dl-riotboard.dts index 43cb3fd76be7..5111f5170d53 100644 --- a/arch/arm/boot/dts/imx6dl-riotboard.dts +++ b/arch/arm/boot/dts/imx6dl-riotboard.dts | |||
@@ -305,8 +305,8 @@ | |||
305 | &usdhc2 { | 305 | &usdhc2 { |
306 | pinctrl-names = "default"; | 306 | pinctrl-names = "default"; |
307 | pinctrl-0 = <&pinctrl_usdhc2>; | 307 | pinctrl-0 = <&pinctrl_usdhc2>; |
308 | cd-gpios = <&gpio1 4 0>; | 308 | cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; |
309 | wp-gpios = <&gpio1 2 0>; | 309 | wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; |
310 | vmmc-supply = <®_3p3v>; | 310 | vmmc-supply = <®_3p3v>; |
311 | status = "okay"; | 311 | status = "okay"; |
312 | }; | 312 | }; |
@@ -314,8 +314,8 @@ | |||
314 | &usdhc3 { | 314 | &usdhc3 { |
315 | pinctrl-names = "default"; | 315 | pinctrl-names = "default"; |
316 | pinctrl-0 = <&pinctrl_usdhc3>; | 316 | pinctrl-0 = <&pinctrl_usdhc3>; |
317 | cd-gpios = <&gpio7 0 0>; | 317 | cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; |
318 | wp-gpios = <&gpio7 1 0>; | 318 | wp-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>; |
319 | vmmc-supply = <®_3p3v>; | 319 | vmmc-supply = <®_3p3v>; |
320 | status = "okay"; | 320 | status = "okay"; |
321 | }; | 321 | }; |
diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts index 78df05e9d1ce..d6515f7a56c4 100644 --- a/arch/arm/boot/dts/imx6q-arm2.dts +++ b/arch/arm/boot/dts/imx6q-arm2.dts | |||
@@ -11,6 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | /dts-v1/; | 13 | /dts-v1/; |
14 | #include <dt-bindings/gpio/gpio.h> | ||
14 | #include "imx6q.dtsi" | 15 | #include "imx6q.dtsi" |
15 | 16 | ||
16 | / { | 17 | / { |
@@ -196,8 +197,8 @@ | |||
196 | }; | 197 | }; |
197 | 198 | ||
198 | &usdhc3 { | 199 | &usdhc3 { |
199 | cd-gpios = <&gpio6 11 0>; | 200 | cd-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>; |
200 | wp-gpios = <&gpio6 14 0>; | 201 | wp-gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>; |
201 | vmmc-supply = <®_3p3v>; | 202 | vmmc-supply = <®_3p3v>; |
202 | pinctrl-names = "default"; | 203 | pinctrl-names = "default"; |
203 | pinctrl-0 = <&pinctrl_usdhc3 | 204 | pinctrl-0 = <&pinctrl_usdhc3 |
diff --git a/arch/arm/boot/dts/imx6q-gk802.dts b/arch/arm/boot/dts/imx6q-gk802.dts index 703539cf36d3..00bd63e63d0c 100644 --- a/arch/arm/boot/dts/imx6q-gk802.dts +++ b/arch/arm/boot/dts/imx6q-gk802.dts | |||
@@ -7,6 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | /dts-v1/; | 9 | /dts-v1/; |
10 | #include <dt-bindings/gpio/gpio.h> | ||
10 | #include "imx6q.dtsi" | 11 | #include "imx6q.dtsi" |
11 | 12 | ||
12 | / { | 13 | / { |
@@ -161,7 +162,7 @@ | |||
161 | pinctrl-names = "default"; | 162 | pinctrl-names = "default"; |
162 | pinctrl-0 = <&pinctrl_usdhc3>; | 163 | pinctrl-0 = <&pinctrl_usdhc3>; |
163 | bus-width = <4>; | 164 | bus-width = <4>; |
164 | cd-gpios = <&gpio6 11 0>; | 165 | cd-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>; |
165 | vmmc-supply = <®_3p3v>; | 166 | vmmc-supply = <®_3p3v>; |
166 | status = "okay"; | 167 | status = "okay"; |
167 | }; | 168 | }; |
diff --git a/arch/arm/boot/dts/imx6q-tbs2910.dts b/arch/arm/boot/dts/imx6q-tbs2910.dts index a43abfa21e33..5645d52850a7 100644 --- a/arch/arm/boot/dts/imx6q-tbs2910.dts +++ b/arch/arm/boot/dts/imx6q-tbs2910.dts | |||
@@ -251,7 +251,7 @@ | |||
251 | pinctrl-names = "default"; | 251 | pinctrl-names = "default"; |
252 | pinctrl-0 = <&pinctrl_usdhc2>; | 252 | pinctrl-0 = <&pinctrl_usdhc2>; |
253 | bus-width = <4>; | 253 | bus-width = <4>; |
254 | cd-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; | 254 | cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; |
255 | vmmc-supply = <®_3p3v>; | 255 | vmmc-supply = <®_3p3v>; |
256 | status = "okay"; | 256 | status = "okay"; |
257 | }; | 257 | }; |
@@ -260,7 +260,7 @@ | |||
260 | pinctrl-names = "default"; | 260 | pinctrl-names = "default"; |
261 | pinctrl-0 = <&pinctrl_usdhc3>; | 261 | pinctrl-0 = <&pinctrl_usdhc3>; |
262 | bus-width = <4>; | 262 | bus-width = <4>; |
263 | cd-gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>; | 263 | cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; |
264 | wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; | 264 | wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; |
265 | vmmc-supply = <®_3p3v>; | 265 | vmmc-supply = <®_3p3v>; |
266 | status = "okay"; | 266 | status = "okay"; |
diff --git a/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi b/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi index e6d9195a1da7..f4d6ae564ead 100644 --- a/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi +++ b/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | |||
@@ -173,7 +173,7 @@ | |||
173 | pinctrl-names = "default"; | 173 | pinctrl-names = "default"; |
174 | pinctrl-0 = <&pinctrl_usdhc1>; | 174 | pinctrl-0 = <&pinctrl_usdhc1>; |
175 | vmmc-supply = <®_3p3v>; | 175 | vmmc-supply = <®_3p3v>; |
176 | cd-gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>; | 176 | cd-gpios = <&gpio4 7 GPIO_ACTIVE_LOW>; |
177 | status = "okay"; | 177 | status = "okay"; |
178 | }; | 178 | }; |
179 | 179 | ||
@@ -181,7 +181,7 @@ | |||
181 | pinctrl-names = "default"; | 181 | pinctrl-names = "default"; |
182 | pinctrl-0 = <&pinctrl_usdhc2>; | 182 | pinctrl-0 = <&pinctrl_usdhc2>; |
183 | vmmc-supply = <®_3p3v>; | 183 | vmmc-supply = <®_3p3v>; |
184 | cd-gpios = <&gpio4 8 GPIO_ACTIVE_HIGH>; | 184 | cd-gpios = <&gpio4 8 GPIO_ACTIVE_LOW>; |
185 | status = "okay"; | 185 | status = "okay"; |
186 | }; | 186 | }; |
187 | 187 | ||
diff --git a/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi b/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi index 1d85de2befb3..a47a0399a172 100644 --- a/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | |||
@@ -392,7 +392,7 @@ | |||
392 | &usdhc1 { | 392 | &usdhc1 { |
393 | pinctrl-names = "default"; | 393 | pinctrl-names = "default"; |
394 | pinctrl-0 = <&pinctrl_usdhc1>; | 394 | pinctrl-0 = <&pinctrl_usdhc1>; |
395 | cd-gpios = <&gpio1 27 GPIO_ACTIVE_HIGH>; | 395 | cd-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; |
396 | no-1-8-v; | 396 | no-1-8-v; |
397 | status = "okay"; | 397 | status = "okay"; |
398 | }; | 398 | }; |
@@ -400,7 +400,7 @@ | |||
400 | &usdhc2 { | 400 | &usdhc2 { |
401 | pinctrl-names = "default"; | 401 | pinctrl-names = "default"; |
402 | pinctrl-0 = <&pinctrl_usdhc2>; | 402 | pinctrl-0 = <&pinctrl_usdhc2>; |
403 | cd-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>; | 403 | cd-gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; |
404 | wp-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; | 404 | wp-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; |
405 | no-1-8-v; | 405 | no-1-8-v; |
406 | status = "okay"; | 406 | status = "okay"; |
diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi index 59e5d15e3ec4..ff41f83551de 100644 --- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | |||
@@ -258,6 +258,6 @@ | |||
258 | pinctrl-names = "default"; | 258 | pinctrl-names = "default"; |
259 | pinctrl-0 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2>; | 259 | pinctrl-0 = <&pinctrl_cubox_i_usdhc2_aux &pinctrl_cubox_i_usdhc2>; |
260 | vmmc-supply = <®_3p3v>; | 260 | vmmc-supply = <®_3p3v>; |
261 | cd-gpios = <&gpio1 4 0>; | 261 | cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; |
262 | status = "okay"; | 262 | status = "okay"; |
263 | }; | 263 | }; |
diff --git a/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi b/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi index 2c253d6d20bd..45e7c39e80d5 100644 --- a/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi +++ b/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | |||
@@ -1,3 +1,5 @@ | |||
1 | #include <dt-bindings/gpio/gpio.h> | ||
2 | |||
1 | / { | 3 | / { |
2 | regulators { | 4 | regulators { |
3 | compatible = "simple-bus"; | 5 | compatible = "simple-bus"; |
@@ -181,7 +183,7 @@ | |||
181 | &usdhc2 { /* module slot */ | 183 | &usdhc2 { /* module slot */ |
182 | pinctrl-names = "default"; | 184 | pinctrl-names = "default"; |
183 | pinctrl-0 = <&pinctrl_usdhc2>; | 185 | pinctrl-0 = <&pinctrl_usdhc2>; |
184 | cd-gpios = <&gpio2 2 0>; | 186 | cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; |
185 | status = "okay"; | 187 | status = "okay"; |
186 | }; | 188 | }; |
187 | 189 | ||
diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi index b5756c21ea1d..4493f6e99330 100644 --- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | |||
@@ -318,7 +318,7 @@ | |||
318 | &usdhc3 { | 318 | &usdhc3 { |
319 | pinctrl-names = "default"; | 319 | pinctrl-names = "default"; |
320 | pinctrl-0 = <&pinctrl_usdhc3>; | 320 | pinctrl-0 = <&pinctrl_usdhc3>; |
321 | cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>; | 321 | cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; |
322 | vmmc-supply = <®_3p3v>; | 322 | vmmc-supply = <®_3p3v>; |
323 | status = "okay"; | 323 | status = "okay"; |
324 | }; | 324 | }; |
diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi index 86f03c1b147c..a857d1294609 100644 --- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | |||
@@ -324,7 +324,7 @@ | |||
324 | &usdhc3 { | 324 | &usdhc3 { |
325 | pinctrl-names = "default"; | 325 | pinctrl-names = "default"; |
326 | pinctrl-0 = <&pinctrl_usdhc3>; | 326 | pinctrl-0 = <&pinctrl_usdhc3>; |
327 | cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>; | 327 | cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; |
328 | vmmc-supply = <®_3p3v>; | 328 | vmmc-supply = <®_3p3v>; |
329 | status = "okay"; | 329 | status = "okay"; |
330 | }; | 330 | }; |
diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi index 4a8d97f47759..1afe3385e2d2 100644 --- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | |||
@@ -417,7 +417,7 @@ | |||
417 | &usdhc3 { | 417 | &usdhc3 { |
418 | pinctrl-names = "default"; | 418 | pinctrl-names = "default"; |
419 | pinctrl-0 = <&pinctrl_usdhc3>; | 419 | pinctrl-0 = <&pinctrl_usdhc3>; |
420 | cd-gpios = <&gpio7 0 GPIO_ACTIVE_HIGH>; | 420 | cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; |
421 | vmmc-supply = <®_3p3v>; | 421 | vmmc-supply = <®_3p3v>; |
422 | status = "okay"; | 422 | status = "okay"; |
423 | }; | 423 | }; |
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi index 62a82f3eba88..6dd0b764e036 100644 --- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi +++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | |||
@@ -299,6 +299,6 @@ | |||
299 | &pinctrl_hummingboard_usdhc2 | 299 | &pinctrl_hummingboard_usdhc2 |
300 | >; | 300 | >; |
301 | vmmc-supply = <®_3p3v>; | 301 | vmmc-supply = <®_3p3v>; |
302 | cd-gpios = <&gpio1 4 0>; | 302 | cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; |
303 | status = "okay"; | 303 | status = "okay"; |
304 | }; | 304 | }; |
diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi index 3af16dfe417b..d7fe6672d00c 100644 --- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | |||
@@ -453,7 +453,7 @@ | |||
453 | &usdhc3 { | 453 | &usdhc3 { |
454 | pinctrl-names = "default"; | 454 | pinctrl-names = "default"; |
455 | pinctrl-0 = <&pinctrl_usdhc3>; | 455 | pinctrl-0 = <&pinctrl_usdhc3>; |
456 | cd-gpios = <&gpio7 0 0>; | 456 | cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; |
457 | vmmc-supply = <®_3p3v>; | 457 | vmmc-supply = <®_3p3v>; |
458 | status = "okay"; | 458 | status = "okay"; |
459 | }; | 459 | }; |
@@ -461,7 +461,7 @@ | |||
461 | &usdhc4 { | 461 | &usdhc4 { |
462 | pinctrl-names = "default"; | 462 | pinctrl-names = "default"; |
463 | pinctrl-0 = <&pinctrl_usdhc4>; | 463 | pinctrl-0 = <&pinctrl_usdhc4>; |
464 | cd-gpios = <&gpio2 6 0>; | 464 | cd-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>; |
465 | vmmc-supply = <®_3p3v>; | 465 | vmmc-supply = <®_3p3v>; |
466 | status = "okay"; | 466 | status = "okay"; |
467 | }; | 467 | }; |
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi index 1ce6133b67f5..9e6ecd99b472 100644 --- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi +++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | |||
@@ -409,8 +409,8 @@ | |||
409 | &usdhc2 { | 409 | &usdhc2 { |
410 | pinctrl-names = "default"; | 410 | pinctrl-names = "default"; |
411 | pinctrl-0 = <&pinctrl_usdhc2>; | 411 | pinctrl-0 = <&pinctrl_usdhc2>; |
412 | cd-gpios = <&gpio1 4 0>; | 412 | cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; |
413 | wp-gpios = <&gpio1 2 0>; | 413 | wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; |
414 | status = "disabled"; | 414 | status = "disabled"; |
415 | }; | 415 | }; |
416 | 416 | ||
@@ -418,7 +418,7 @@ | |||
418 | pinctrl-names = "default"; | 418 | pinctrl-names = "default"; |
419 | pinctrl-0 = <&pinctrl_usdhc3 | 419 | pinctrl-0 = <&pinctrl_usdhc3 |
420 | &pinctrl_usdhc3_cdwp>; | 420 | &pinctrl_usdhc3_cdwp>; |
421 | cd-gpios = <&gpio1 27 0>; | 421 | cd-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>; |
422 | wp-gpios = <&gpio1 29 0>; | 422 | wp-gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>; |
423 | status = "disabled"; | 423 | status = "disabled"; |
424 | }; | 424 | }; |
diff --git a/arch/arm/boot/dts/imx6qdl-rex.dtsi b/arch/arm/boot/dts/imx6qdl-rex.dtsi index 488a640796ac..3373fd958e95 100644 --- a/arch/arm/boot/dts/imx6qdl-rex.dtsi +++ b/arch/arm/boot/dts/imx6qdl-rex.dtsi | |||
@@ -342,7 +342,7 @@ | |||
342 | pinctrl-0 = <&pinctrl_usdhc2>; | 342 | pinctrl-0 = <&pinctrl_usdhc2>; |
343 | bus-width = <4>; | 343 | bus-width = <4>; |
344 | cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; | 344 | cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; |
345 | wp-gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; | 345 | wp-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>; |
346 | status = "okay"; | 346 | status = "okay"; |
347 | }; | 347 | }; |
348 | 348 | ||
@@ -351,6 +351,6 @@ | |||
351 | pinctrl-0 = <&pinctrl_usdhc3>; | 351 | pinctrl-0 = <&pinctrl_usdhc3>; |
352 | bus-width = <4>; | 352 | bus-width = <4>; |
353 | cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; | 353 | cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; |
354 | wp-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; | 354 | wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; |
355 | status = "okay"; | 355 | status = "okay"; |
356 | }; | 356 | }; |
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi index 3b24b12651b2..e329ca5c3322 100644 --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | |||
@@ -467,8 +467,8 @@ | |||
467 | pinctrl-0 = <&pinctrl_usdhc3>; | 467 | pinctrl-0 = <&pinctrl_usdhc3>; |
468 | pinctrl-1 = <&pinctrl_usdhc3_100mhz>; | 468 | pinctrl-1 = <&pinctrl_usdhc3_100mhz>; |
469 | pinctrl-2 = <&pinctrl_usdhc3_200mhz>; | 469 | pinctrl-2 = <&pinctrl_usdhc3_200mhz>; |
470 | cd-gpios = <&gpio6 15 0>; | 470 | cd-gpios = <&gpio6 15 GPIO_ACTIVE_LOW>; |
471 | wp-gpios = <&gpio1 13 0>; | 471 | wp-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; |
472 | status = "okay"; | 472 | status = "okay"; |
473 | }; | 473 | }; |
474 | 474 | ||
diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi index e00c44f6a0df..782379320517 100644 --- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | |||
@@ -448,8 +448,8 @@ | |||
448 | &usdhc3 { | 448 | &usdhc3 { |
449 | pinctrl-names = "default"; | 449 | pinctrl-names = "default"; |
450 | pinctrl-0 = <&pinctrl_usdhc3>; | 450 | pinctrl-0 = <&pinctrl_usdhc3>; |
451 | cd-gpios = <&gpio7 0 0>; | 451 | cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>; |
452 | wp-gpios = <&gpio7 1 0>; | 452 | wp-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>; |
453 | vmmc-supply = <®_3p3v>; | 453 | vmmc-supply = <®_3p3v>; |
454 | status = "okay"; | 454 | status = "okay"; |
455 | }; | 455 | }; |
@@ -457,7 +457,7 @@ | |||
457 | &usdhc4 { | 457 | &usdhc4 { |
458 | pinctrl-names = "default"; | 458 | pinctrl-names = "default"; |
459 | pinctrl-0 = <&pinctrl_usdhc4>; | 459 | pinctrl-0 = <&pinctrl_usdhc4>; |
460 | cd-gpios = <&gpio2 6 0>; | 460 | cd-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>; |
461 | vmmc-supply = <®_3p3v>; | 461 | vmmc-supply = <®_3p3v>; |
462 | status = "okay"; | 462 | status = "okay"; |
463 | }; | 463 | }; |
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi index a626e6dd8022..944eb81cb2b8 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi | |||
@@ -562,8 +562,8 @@ | |||
562 | pinctrl-names = "default"; | 562 | pinctrl-names = "default"; |
563 | pinctrl-0 = <&pinctrl_usdhc2>; | 563 | pinctrl-0 = <&pinctrl_usdhc2>; |
564 | bus-width = <8>; | 564 | bus-width = <8>; |
565 | cd-gpios = <&gpio2 2 0>; | 565 | cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; |
566 | wp-gpios = <&gpio2 3 0>; | 566 | wp-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>; |
567 | status = "okay"; | 567 | status = "okay"; |
568 | }; | 568 | }; |
569 | 569 | ||
@@ -571,8 +571,8 @@ | |||
571 | pinctrl-names = "default"; | 571 | pinctrl-names = "default"; |
572 | pinctrl-0 = <&pinctrl_usdhc3>; | 572 | pinctrl-0 = <&pinctrl_usdhc3>; |
573 | bus-width = <8>; | 573 | bus-width = <8>; |
574 | cd-gpios = <&gpio2 0 0>; | 574 | cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; |
575 | wp-gpios = <&gpio2 1 0>; | 575 | wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>; |
576 | status = "okay"; | 576 | status = "okay"; |
577 | }; | 577 | }; |
578 | 578 | ||
diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi index f02b80b41d4f..da08de324e9e 100644 --- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi +++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi | |||
@@ -680,7 +680,7 @@ | |||
680 | pinctrl-0 = <&pinctrl_usdhc1>; | 680 | pinctrl-0 = <&pinctrl_usdhc1>; |
681 | bus-width = <4>; | 681 | bus-width = <4>; |
682 | no-1-8-v; | 682 | no-1-8-v; |
683 | cd-gpios = <&gpio7 2 0>; | 683 | cd-gpios = <&gpio7 2 GPIO_ACTIVE_LOW>; |
684 | fsl,wp-controller; | 684 | fsl,wp-controller; |
685 | status = "okay"; | 685 | status = "okay"; |
686 | }; | 686 | }; |
@@ -690,7 +690,7 @@ | |||
690 | pinctrl-0 = <&pinctrl_usdhc2>; | 690 | pinctrl-0 = <&pinctrl_usdhc2>; |
691 | bus-width = <4>; | 691 | bus-width = <4>; |
692 | no-1-8-v; | 692 | no-1-8-v; |
693 | cd-gpios = <&gpio7 3 0>; | 693 | cd-gpios = <&gpio7 3 GPIO_ACTIVE_LOW>; |
694 | fsl,wp-controller; | 694 | fsl,wp-controller; |
695 | status = "okay"; | 695 | status = "okay"; |
696 | }; | 696 | }; |
diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi index 5fb091675582..9e096d811bed 100644 --- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi +++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi | |||
@@ -9,6 +9,8 @@ | |||
9 | * | 9 | * |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <dt-bindings/gpio/gpio.h> | ||
13 | |||
12 | / { | 14 | / { |
13 | regulators { | 15 | regulators { |
14 | compatible = "simple-bus"; | 16 | compatible = "simple-bus"; |
@@ -250,13 +252,13 @@ | |||
250 | &usdhc1 { | 252 | &usdhc1 { |
251 | pinctrl-names = "default"; | 253 | pinctrl-names = "default"; |
252 | pinctrl-0 = <&pinctrl_usdhc1>; | 254 | pinctrl-0 = <&pinctrl_usdhc1>; |
253 | cd-gpios = <&gpio1 2 0>; | 255 | cd-gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; |
254 | status = "okay"; | 256 | status = "okay"; |
255 | }; | 257 | }; |
256 | 258 | ||
257 | &usdhc3 { | 259 | &usdhc3 { |
258 | pinctrl-names = "default"; | 260 | pinctrl-names = "default"; |
259 | pinctrl-0 = <&pinctrl_usdhc3>; | 261 | pinctrl-0 = <&pinctrl_usdhc3>; |
260 | cd-gpios = <&gpio3 9 0>; | 262 | cd-gpios = <&gpio3 9 GPIO_ACTIVE_LOW>; |
261 | status = "okay"; | 263 | status = "okay"; |
262 | }; | 264 | }; |
diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts index 945887d3fdb3..b84dff2e94ea 100644 --- a/arch/arm/boot/dts/imx6sl-evk.dts +++ b/arch/arm/boot/dts/imx6sl-evk.dts | |||
@@ -617,8 +617,8 @@ | |||
617 | pinctrl-1 = <&pinctrl_usdhc1_100mhz>; | 617 | pinctrl-1 = <&pinctrl_usdhc1_100mhz>; |
618 | pinctrl-2 = <&pinctrl_usdhc1_200mhz>; | 618 | pinctrl-2 = <&pinctrl_usdhc1_200mhz>; |
619 | bus-width = <8>; | 619 | bus-width = <8>; |
620 | cd-gpios = <&gpio4 7 0>; | 620 | cd-gpios = <&gpio4 7 GPIO_ACTIVE_LOW>; |
621 | wp-gpios = <&gpio4 6 0>; | 621 | wp-gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; |
622 | status = "okay"; | 622 | status = "okay"; |
623 | }; | 623 | }; |
624 | 624 | ||
@@ -627,8 +627,8 @@ | |||
627 | pinctrl-0 = <&pinctrl_usdhc2>; | 627 | pinctrl-0 = <&pinctrl_usdhc2>; |
628 | pinctrl-1 = <&pinctrl_usdhc2_100mhz>; | 628 | pinctrl-1 = <&pinctrl_usdhc2_100mhz>; |
629 | pinctrl-2 = <&pinctrl_usdhc2_200mhz>; | 629 | pinctrl-2 = <&pinctrl_usdhc2_200mhz>; |
630 | cd-gpios = <&gpio5 0 0>; | 630 | cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>; |
631 | wp-gpios = <&gpio4 29 0>; | 631 | wp-gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>; |
632 | status = "okay"; | 632 | status = "okay"; |
633 | }; | 633 | }; |
634 | 634 | ||
@@ -637,6 +637,6 @@ | |||
637 | pinctrl-0 = <&pinctrl_usdhc3>; | 637 | pinctrl-0 = <&pinctrl_usdhc3>; |
638 | pinctrl-1 = <&pinctrl_usdhc3_100mhz>; | 638 | pinctrl-1 = <&pinctrl_usdhc3_100mhz>; |
639 | pinctrl-2 = <&pinctrl_usdhc3_200mhz>; | 639 | pinctrl-2 = <&pinctrl_usdhc3_200mhz>; |
640 | cd-gpios = <&gpio3 22 0>; | 640 | cd-gpios = <&gpio3 22 GPIO_ACTIVE_LOW>; |
641 | status = "okay"; | 641 | status = "okay"; |
642 | }; | 642 | }; |
diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts index e3c0b63c2205..115f3fd78971 100644 --- a/arch/arm/boot/dts/imx6sx-sabreauto.dts +++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts | |||
@@ -49,7 +49,7 @@ | |||
49 | pinctrl-1 = <&pinctrl_usdhc3_100mhz>; | 49 | pinctrl-1 = <&pinctrl_usdhc3_100mhz>; |
50 | pinctrl-2 = <&pinctrl_usdhc3_200mhz>; | 50 | pinctrl-2 = <&pinctrl_usdhc3_200mhz>; |
51 | bus-width = <8>; | 51 | bus-width = <8>; |
52 | cd-gpios = <&gpio7 10 GPIO_ACTIVE_HIGH>; | 52 | cd-gpios = <&gpio7 10 GPIO_ACTIVE_LOW>; |
53 | wp-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; | 53 | wp-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; |
54 | keep-power-in-suspend; | 54 | keep-power-in-suspend; |
55 | enable-sdio-wakeup; | 55 | enable-sdio-wakeup; |
@@ -61,7 +61,7 @@ | |||
61 | pinctrl-names = "default"; | 61 | pinctrl-names = "default"; |
62 | pinctrl-0 = <&pinctrl_usdhc4>; | 62 | pinctrl-0 = <&pinctrl_usdhc4>; |
63 | bus-width = <8>; | 63 | bus-width = <8>; |
64 | cd-gpios = <&gpio7 11 GPIO_ACTIVE_HIGH>; | 64 | cd-gpios = <&gpio7 11 GPIO_ACTIVE_LOW>; |
65 | no-1-8-v; | 65 | no-1-8-v; |
66 | keep-power-in-suspend; | 66 | keep-power-in-suspend; |
67 | enable-sdio-wakup; | 67 | enable-sdio-wakup; |
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi index cef04cef3a80..ac88c3467078 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dtsi +++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi | |||
@@ -293,7 +293,7 @@ | |||
293 | pinctrl-1 = <&pinctrl_usdhc3_100mhz>; | 293 | pinctrl-1 = <&pinctrl_usdhc3_100mhz>; |
294 | pinctrl-2 = <&pinctrl_usdhc3_200mhz>; | 294 | pinctrl-2 = <&pinctrl_usdhc3_200mhz>; |
295 | bus-width = <8>; | 295 | bus-width = <8>; |
296 | cd-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; | 296 | cd-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>; |
297 | wp-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>; | 297 | wp-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>; |
298 | keep-power-in-suspend; | 298 | keep-power-in-suspend; |
299 | enable-sdio-wakeup; | 299 | enable-sdio-wakeup; |
@@ -304,7 +304,7 @@ | |||
304 | &usdhc4 { | 304 | &usdhc4 { |
305 | pinctrl-names = "default"; | 305 | pinctrl-names = "default"; |
306 | pinctrl-0 = <&pinctrl_usdhc4>; | 306 | pinctrl-0 = <&pinctrl_usdhc4>; |
307 | cd-gpios = <&gpio6 21 GPIO_ACTIVE_HIGH>; | 307 | cd-gpios = <&gpio6 21 GPIO_ACTIVE_LOW>; |
308 | wp-gpios = <&gpio6 20 GPIO_ACTIVE_HIGH>; | 308 | wp-gpios = <&gpio6 20 GPIO_ACTIVE_HIGH>; |
309 | status = "okay"; | 309 | status = "okay"; |
310 | }; | 310 | }; |