MLK-11350 ARM: dts: imx7d/imx6ul: 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: Haibo Chen <haibo.chen@freescale.com>

diff --git a/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts
index dbcc017..521cedb 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2.dts
@@ -725,8 +725,8 @@
        pinctrl-0 = <&pinctrl_usdhc1>;
        pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
        pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
-       cd-gpios = <&gpio1 19 0>;
-       wp-gpios = <&gpio1 18 0>;
+       cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
+       wp-gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;
        keep-power-in-suspend;
        enable-sdio-wakeup;
        vmmc-supply = <&reg_sd1_vmmc>;
@@ -738,8 +738,8 @@
        pinctrl-0 = <&pinctrl_usdhc2>;
        pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
        pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
-       cd-gpios = <&gpio4 17 0>;
-       wp-gpios = <&gpio4 18 0>;
+       cd-gpios = <&gpio4 17 GPIO_ACTIVE_LOW>;
+       wp-gpios = <&gpio4 18 GPIO_ACTIVE_HIGH>;
        keep-power-in-suspend;
        enable-sdio-wakeup;
        vmmc-supply = <&reg_sd2_vmmc>;

diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
index 937d4a2..5aa54fb 100644 (file)
--- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
@@ -502,8 +502,8 @@
 &usdhc1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usdhc1_1>;
-       cd-gpios = <&gpio5 0 0>;
-       wp-gpios = <&gpio5 1 0>;
+       cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
+       wp-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;
        no-1-8-v;
        keep-power-in-suspend;
        enable-sdio-wakeup;
@@ -516,8 +516,8 @@
        pinctrl-0 = <&pinctrl_usdhc2_1>;
        pinctrl-1 = <&pinctrl_usdhc2_1_100mhz>;
        pinctrl-2 = <&pinctrl_usdhc2_1_200mhz>;
-       cd-gpios = <&gpio5 9 0>;
-       wp-gpios = <&gpio5 10 0>;
+       cd-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>;
+       wp-gpios = <&gpio5 10 GPIO_ACTIVE_HIGH>;
        keep-power-in-suspend;
        enable-sdio-wakeup;
        vmmc-supply = <&reg_sd2_vmmc>;