From: xbw <xbw@rock-chips.com>
Date: Sun, 23 Mar 2014 22:14:34 +0000 (+0800)
Subject: SDMMC: modify the setting of sdio.
X-Git-Tag: firefly_0821_release~5880
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9eab9d35265a9860ef61b7629845f9ebb70d6ebd;p=firefly-linux-kernel-4.4.55.git

SDMMC: modify the setting of sdio.
---

diff --git a/arch/arm/boot/dts/rk3288-tb.dts b/arch/arm/boot/dts/rk3288-tb.dts
index 5b70da8b6896..2f3450076a57 100755
--- a/arch/arm/boot/dts/rk3288-tb.dts
+++ b/arch/arm/boot/dts/rk3288-tb.dts
@@ -194,9 +194,9 @@
 		
   	supports-highspeed;		
 	supports-sdio;
-	cap-sdio-irq;
+	//cap-sdio-irq;
 
-	status = "diabled";
+	status = "okay";
 };
 
 &spi0 {
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 6cccdb0e29f4..20551c5e2c90 100755
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -322,6 +322,7 @@
 
                 fifo-depth = <0x100>;
                 bus-width = <4>;
+		status = "disabled";
         };
 
         spi0: spi@ff110000 {
diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index e426de2a56c9..fc39351b7e2e 100755
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -466,7 +466,7 @@ CONFIG_DWC_OTG_310=y
 CONFIG_USB20_HOST=y
 CONFIG_USB20_OTG=y
 CONFIG_MMC=y
-CONFIG_MMC_CLKGATE=y
+# CONFIG_MMC_CLKGATE is not set
 CONFIG_MMC_PARANOID_SD_INIT=y
 CONFIG_MMC_BLOCK_MINORS=32
 # CONFIG_MMC_BLOCK_BOUNCE is not set