UPSTREAM: ARM: dts: rockchip: make rk3288-grf a simple-mfd

[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 b15809bbf01c9437c04dd57463b32957861908d1..197fe6640d340b8290f17a45411f11221ec558f5 100755 (executable)
--- a/arch/arm/boot/dts/rk312x-pinctrl.dtsi
+++ b/arch/arm/boot/dts/rk312x-pinctrl.dtsi
@@ -96,7 +96,7 @@
                        uart0_xfer: uart0-xfer {
                                rockchip,pins = <UART0_SIN>,
                                                <UART0_SOUT>;
-                               rockchip,pull = <VALUE_PULL_DEFAULT>;
+                               rockchip,pull = <VALUE_PULL_UPDOWN_DISABLE>;
                                
                                
                        };
@@ -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>;
                        };
 
                };
@@ -828,7 +828,6 @@
                                                <LCDC0_HSYNC>,
                                                <LCDC0_VSYNC>;
                                rockchip,pull = <VALUE_PULL_DISABLE>;
-                               rockchip,drive = <VALUE_DRV_DEFAULT>;
                        };
 
                        lcdc0_gpio:lcdc0-gpio {
@@ -838,7 +837,6 @@
                                                <FUNC_TO_GPIO(LCDC0_HSYNC)>,
                                                <FUNC_TO_GPIO(LCDC0_VSYNC)>;
                                rockchip,pull = <VALUE_PULL_DISABLE>;
-                               rockchip,drive = <VALUE_DRV_DEFAULT>;
                        };
 
                };
@@ -863,7 +861,6 @@
                                                <LCDC0_D23>;
                                                */
                                rockchip,pull = <VALUE_PULL_DISABLE>;
-                               rockchip,drive = <VALUE_DRV_DEFAULT>;
                        };
 
                        lcdc0_lcdc_gpio: lcdc0-lcdc_gpio {
@@ -885,7 +882,6 @@
                                                <FUNC_TO_GPIO(LCDC0_D23)>;
                                                */
                                rockchip,pull = <VALUE_PULL_DOWN>;
-                               rockchip,drive = <VALUE_DRV_DEFAULT>;
                        };
 
                };