From 83816aeb045d2b88527dbf4f975cfdd3987cab24 Mon Sep 17 00:00:00 2001 From: lintao Date: Fri, 25 Jul 2014 14:24:27 +0800 Subject: [PATCH] rk3126: dts: enable pinctrl --- arch/arm/boot/dts/rk312x-pinctrl.dtsi | 6 ++++++ arch/arm/boot/dts/rk312x.dtsi | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/rk312x-pinctrl.dtsi b/arch/arm/boot/dts/rk312x-pinctrl.dtsi index aea760caea3e..8545c7d7dc51 100755 --- 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 = , //pwren + ; //cmd + rockchip,pull = ; + } + }; gpio0_pwm{ diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi index d333b9f40806..40c35c5886e8 100755 --- a/arch/arm/boot/dts/rk312x.dtsi +++ b/arch/arm/boot/dts/rk312x.dtsi @@ -399,9 +399,9 @@ interrupts = ; #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 = ; #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>; -- 2.34.1