rk3126: dts: enable pinctrl

diff --git a/arch/arm/boot/dts/rk312x-pinctrl.dtsi b/arch/arm/boot/dts/rk312x-pinctrl.dtsi
index aea760caea3eb993c909b2ac75ed7a4f628e19e2..8545c7d7dc51ea1deb454946fb34f92677497c12 100755 (executable)
--- a/arch/arm/boot/dts/rk312x-pinctrl.dtsi
+++ b/arch/arm/boot/dts/rk312x-pinctrl.dtsi
@@ -662,6 +662,12 @@
 
                        };
 
+                       sdio0_gpio: sdio0_gpio{
+                               rockchip,pins = <GPIO0_D6>, //pwren
+                                               <GPIO0_A3>; //cmd
+                               rockchip,pull = <VALUE_PULL_UP>;
+                       }
+
                };
                 
                gpio0_pwm{

diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index d333b9f40806daa017e57c7322f86d28b76d49de..40c35c5886e86d5af1d0d054e549cb3e8755af6d 100755 (executable)
--- a/arch/arm/boot/dts/rk312x.dtsi
+++ b/arch/arm/boot/dts/rk312x.dtsi
@@ -399,9 +399,9 @@
                interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
                #address-cells = <1>;
                #size-cells = <0>;
-               //pinctrl-names = "default", "idle";
-               //pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>;
-               //pinctrl-1 = <&sdmmc0_gpio>;
+               pinctrl-names = "default", "idle";
+               pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_dectn &sdmmc0_bus4>;
+               pinctrl-1 = <&sdmmc0_gpio>;
                //cd-gpios = <&gpio1 GPIO_C1 GPIO_ACTIVE_HIGH>;/*CD GPIO*/
                clocks = <&clk_sdmmc0>, <&clk_gates5 10>;
                clock-names = "clk_mmc", "hclk_mmc";
@@ -418,9 +418,9 @@
                interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
                #address-cells = <1>;
                #size-cells = <0>;
-               //pinctrl-names = "default","idle";
-               //pinctrl-0 = <&sdio0_clk &sdio0_cmd  &sdio0_bus4>;
-               //pinctrl-1 = <&sdio0_gpio>;
+               pinctrl-names = "default","idle";
+               pinctrl-0 = <&sdio0_pwren &sdio0_cmd>;
+               pinctrl-1 = <&sdio0_gpio>;
                clocks = <&clk_sdio>, <&clk_gates5 11>;
                clock-names = "clk_mmc", "hclk_mmc";
                dmas = <&pdma 11>;