These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / boot / dts / imx6sx-sdb.dtsi

diff --git a/kernel/arch/arm/boot/dts/imx6sx-sdb.dtsi b/kernel/arch/arm/boot/dts/imx6sx-sdb.dtsi
index cef04ce..94ac400 100644 (file)
--- a/kernel/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/kernel/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -114,7 +114,7 @@
                        regulator-name = "peri_3v3";
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
-                       gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>;
+                       gpio = <&gpio4 16 GPIO_ACTIVE_HIGH>;
                        enable-active-high;
                        regulator-always-on;
                };
@@ -293,7 +293,7 @@
        pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
        pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
        bus-width = <8>;
-       cd-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>;
+       cd-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
        wp-gpios = <&gpio2 15 GPIO_ACTIVE_HIGH>;
        keep-power-in-suspend;
        enable-sdio-wakeup;
@@ -304,7 +304,7 @@
 &usdhc4 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usdhc4>;
-       cd-gpios = <&gpio6 21 GPIO_ACTIVE_HIGH>;
+       cd-gpios = <&gpio6 21 GPIO_ACTIVE_LOW>;
        wp-gpios = <&gpio6 20 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };