From: lintao <lintao@rock-chips.com>
Date: Wed, 25 Jun 2014 13:37:57 +0000 (+0800)
Subject: mmc: core: rk_sdmmc: prepare for next Soc(s)
X-Git-Tag: firefly_0821_release~4916^2~323
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7356507c70844c6df7967664b61a10578a0a314a;p=firefly-linux-kernel-4.4.55.git

mmc: core: rk_sdmmc: prepare for next Soc(s)
	fix commit-sha1 4ae0cc94: cherry-pick wrong commit from experimental branch
---

diff --git a/arch/arm/boot/dts/rk3036-fpga.dts b/arch/arm/boot/dts/rk3036-fpga.dts
index ff6af44f2dec..b78f28059888 100644
--- a/arch/arm/boot/dts/rk3036-fpga.dts
+++ b/arch/arm/boot/dts/rk3036-fpga.dts
@@ -18,17 +18,5 @@
 		status = "okay";
 	};
 
-	&sdmmc {
-		clock-frequency = <50000000>;
-		clock-freq-min-max = <400000 50000000>;
-		supports-highspeed;
-		supports-sd;
-		broken-cd;
-		card-detect-delay = <200>;
-		ignore-pm-notify;
-		keep-power-in-suspend;
-		//vmmc-supply = <&rk808_ldo5_reg>;
-		status = "okay";
-	};
 
 };
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 3a6f915e142d..2d5a8e2fc606 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -281,8 +281,8 @@
 		//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_sdmmc>, <&clk_gates2 11>;
+		//cd-gpios = <&gpio1 GPIO_C1 GPIO_ACTIVE_HIGH>;/*CD GPIO*/
+		clocks = <&clk_sdmmc0>, <&clk_gates2 11>;
 		clock-names = "clk_mmc", "hclk_mmc";
 		num-slots = <1>;
 		fifo-depth = <0x100>;