Merge tag 'iio-fixes-for-4.5b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[cascardo/linux.git] / arch / arm / boot / dts / imx28-duckbill.dts

diff --git a/arch/arm/boot/dts/imx28-duckbill.dts b/arch/arm/boot/dts/imx28-duckbill.dts
index 5f326c1..ce1a7ef 100644 (file)
--- a/arch/arm/boot/dts/imx28-duckbill.dts
+++ b/arch/arm/boot/dts/imx28-duckbill.dts
@@ -25,9 +25,9 @@
                        ssp0: ssp@80010000 {
                                compatible = "fsl,imx28-mmc";
                                pinctrl-names = "default";
-                               pinctrl-0 = <&mmc0_8bit_pins_a
+                               pinctrl-0 = <&mmc0_4bit_pins_a
                                        &mmc0_cd_cfg &mmc0_sck_cfg>;
-                               bus-width = <8>;
+                               bus-width = <4>;
                                vmmc-supply = <&reg_3p3v>;
                                status = "okay";
                        };
@@ -39,7 +39,7 @@
                                hog_pins_a: hog@0 {
                                        reg = <0>;
                                        fsl,pinmux-ids = <
-                                               MX28_PAD_ENET0_RX_CLK__GPIO_4_13 /* PHY Reset */
+                                               MX28_PAD_SSP0_DATA7__GPIO_2_7 /* PHY Reset */
                                        >;
                                        fsl,drive-strength = <MXS_DRIVE_4mA>;
                                        fsl,voltage = <MXS_VOLTAGE_HIGH>;
@@ -82,7 +82,7 @@
                        pinctrl-names = "default";
                        pinctrl-0 = <&mac0_pins_a>;
                        phy-supply = <&reg_3p3v>;
-                       phy-reset-gpios = <&gpio4 13 0>;
+                       phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
                        phy-reset-duration = <100>;
                        status = "okay";
                };
@@ -110,12 +110,12 @@
 
                status {
                        label = "duckbill:green:status";
-                       gpios = <&gpio3 5 0>;
+                       gpios = <&gpio3 5 GPIO_ACTIVE_HIGH>;
                };
 
                failure {
                        label = "duckbill:red:status";
-                       gpios = <&gpio3 4 0>;
+                       gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
                };
        };
 };