Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89c1a8cf authored by Dong Aisheng's avatar Dong Aisheng Committed by Ulf Hansson
Browse files

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: default avatarDong Aisheng <aisheng.dong@freescale.com>
Acked-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 94d76946

arch/arm/boot/dts/imx6dl-riotboard.dts

+4 −4
Original line number Diff line number Diff line
@@ -305,8 +305,8 @@ 
&usdhc2 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc2>;

	cd-gpios = <&gpio1 4 0>;

	wp-gpios = <&gpio1 2 0>;

	cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;

	vmmc-supply = <&reg_3p3v>;

	status = "okay";

};
@@ -314,8 +314,8 @@ 
&usdhc3 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc3>;

	cd-gpios = <&gpio7 0 0>;

	wp-gpios = <&gpio7 1 0>;

	cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;

	vmmc-supply = <&reg_3p3v>;

	status = "okay";

};

arch/arm/boot/dts/imx6q-arm2.dts

+3 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



/dts-v1/;

#include <dt-bindings/gpio/gpio.h>

#include "imx6q.dtsi"



/ {
@@ -196,8 +197,8 @@ 
};



&usdhc3 {

	cd-gpios = <&gpio6 11 0>;

	wp-gpios = <&gpio6 14 0>;

	cd-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio6 14 GPIO_ACTIVE_HIGH>;

	vmmc-supply = <&reg_3p3v>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc3

arch/arm/boot/dts/imx6q-gk802.dts

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 */



/dts-v1/;

#include <dt-bindings/gpio/gpio.h>

#include "imx6q.dtsi"



/ {
@@ -161,7 +162,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc3>;

	bus-width = <4>;

	cd-gpios = <&gpio6 11 0>;

	cd-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;

	vmmc-supply = <&reg_3p3v>;

	status = "okay";

};

arch/arm/boot/dts/imx6q-tbs2910.dts

+2 −2
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc2>;

	bus-width = <4>;

	cd-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;

	cd-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;

	vmmc-supply = <&reg_3p3v>;

	status = "okay";

};
@@ -260,7 +260,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc3>;

	bus-width = <4>;

	cd-gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;

	cd-gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;

	vmmc-supply = <&reg_3p3v>;

	status = "okay";

arch/arm/boot/dts/imx6qdl-aristainetos.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc1>;

	vmmc-supply = <&reg_3p3v>;

	cd-gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>;

	cd-gpios = <&gpio4 7 GPIO_ACTIVE_LOW>;

	status = "okay";

};
@@ -181,7 +181,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc2>;

	vmmc-supply = <&reg_3p3v>;

	cd-gpios = <&gpio4 8 GPIO_ACTIVE_HIGH>;

	cd-gpios = <&gpio4 8 GPIO_ACTIVE_LOW>;

	status = "okay";

};