Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk312x-pinctrl.dtsi

diff --git a/arch/arm/boot/dts/rk312x-pinctrl.dtsi b/arch/arm/boot/dts/rk312x-pinctrl.dtsi
index bea2fe80cedc02021df19ab88e7d29f6971eda4e..197fe6640d340b8290f17a45411f11221ec558f5 100755 (executable)
--- a/arch/arm/boot/dts/rk312x-pinctrl.dtsi
+++ b/arch/arm/boot/dts/rk312x-pinctrl.dtsi
@@ -662,22 +662,22 @@
 
                        sdio0_cmd: sdio0_cmd {
                                rockchip,pins = <MMC1_CMD>;
-                               rockchip,pull = <VALUE_PULL_DISABLE>;
+                               rockchip,pull = <VALUE_PULL_UPDOWN_DISABLE>;
                        };
                        sdio0_clk: sdio0_clk {
                                rockchip,pins = <SDMMC_CLKOUT>;
-                               rockchip,pull = <VALUE_PULL_DISABLE>;
+                               rockchip,pull = <VALUE_PULL_UPDOWN_DISABLE>;
                        };
                        sdio0_bus1: sdio0-bus-width1 {
                                rockchip,pins = <SDMMC_DATA0>;
-                               rockchip,pull = <VALUE_PULL_DISABLE>;
+                               rockchip,pull = <VALUE_PULL_UPDOWN_DISABLE>;
                        };
                        sdio0_bus4: sdio0-bus-width4 {
                                rockchip,pins = <SDMMC_DATA0>,
                                                <SDMMC_DATA1>,
                                                <SDMMC_DATA2>,
                                                <SDMMC_DATA3>;
-                               rockchip,pull = <VALUE_PULL_DISABLE>;
+                               rockchip,pull = <VALUE_PULL_UPDOWN_DISABLE>;
                        };
 
                        sdio0_gpio: sdio0_gpio{
@@ -688,7 +688,7 @@
                                                <GPIO1_A2>, //data1
                                                <GPIO1_A4>, //data2
                                                <GPIO1_A5>; //data3
-                               rockchip,pull = <VALUE_PULL_DISABLE>;
+                               rockchip,pull = <VALUE_PULL_UPDOWN_DISABLE>;
                        };
 
                };