mmc: fix 312x pinctrl

diff --git a/arch/arm/boot/dts/rk312x-pinctrl.dtsi b/arch/arm/boot/dts/rk312x-pinctrl.dtsi
index 61e0628b6661458d2ed322acc156e8778c051b48..377427ebddfb7f9484c081108a71840b02f0afe1 100755 (executable)
--- a/arch/arm/boot/dts/rk312x-pinctrl.dtsi
+++ b/arch/arm/boot/dts/rk312x-pinctrl.dtsi
@@ -666,10 +666,30 @@
                                
 
                        };
+                       sdio0_clk: sdio0_clk {
+                               rockchip,pins = <SDMMC_CLKOUT>;
+                               rockchip,pull = <VALUE_PULL_UP>;
+                       };
+                       sdio0_bus1: sdio0-bus-width1 {
+                               rockchip,pins = <SDMMC_DATA0>;
+                               rockchip,pull = <VALUE_PULL_UP>;
+                       };
+                       sdio0_bus4: sdio0-bus-width4 {
+                               rockchip,pins = <SDMMC_DATA0>,
+                                               <SDMMC_DATA1>,
+                                               <SDMMC_DATA2>,
+                                               <SDMMC_DATA3>;
+                               rockchip,pull = <VALUE_PULL_UP>;
+                       };
 
                        sdio0_gpio: sdio0_gpio{
                                rockchip,pins = <GPIO0_D6>, //pwren
-                                               <GPIO0_A3>; //cmd
+                                               <GPIO0_A3>, //cmd
+                                               <GPIO1_A0>, //clk
+                                               <GPIO1_A1>, //data0
+                                               <GPIO1_A2>, //data1
+                                               <GPIO1_A4>, //data2
+                                               <GPIO1_A5>; //data3
                                rockchip,pull = <VALUE_PULL_UP>;
                        };
 

diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index 35aa3c9c4dd87a7ac09b8470a548f7af4adac692..f3049a7ed965f6cbcd2a14113cd03351a6cff292 100755 (executable)
--- a/arch/arm/boot/dts/rk312x.dtsi
+++ b/arch/arm/boot/dts/rk312x.dtsi
@@ -505,7 +505,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
                pinctrl-names = "default","idle";
-               pinctrl-0 = <&sdio0_pwren &sdio0_cmd>;
+               pinctrl-0 = <&sdio0_pwren &sdio0_cmd &sdio0_clk &sdio0_bus4>;
                pinctrl-1 = <&sdio0_gpio>;
                clocks = <&clk_sdio>, <&clk_gates5 11>;
                clock-names = "clk_mmc", "hclk_mmc";