From: root <root@dxj.(none)>
Date: Mon, 2 Aug 2010 02:57:58 +0000 (+0800)
Subject: raho sdcard 检测修改 --raho 没有cd脚,故只能在关机情况下插拔卡
X-Git-Tag: firefly_0821_release~11314
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=28704e4899153c128788c0768bdfea6fc7348f2f;p=firefly-linux-kernel-4.4.55.git

raho sdcard 检测修改 --raho 没有cd脚,故只能在关机情况下插拔卡
---

diff --git a/arch/arm/mach-rk2818/board-raho.c b/arch/arm/mach-rk2818/board-raho.c
index 689735a6e173..a9fb7f784cd2 100644
--- a/arch/arm/mach-rk2818/board-raho.c
+++ b/arch/arm/mach-rk2818/board-raho.c
@@ -161,10 +161,10 @@ static struct map_desc rk2818_io_desc[] __initdata = {
 *****************************************************************************************/
  void rk2818_sdmmc0_cfg_gpio(struct platform_device *dev)
 {
+    rk2818_mux_api_set(GPIOH_MMC0D_SEL_NAME, IOMUXA_SDMMC0_DATA123);
+	rk2818_mux_api_set(GPIOH_MMC0_SEL_NAME, IOMUXA_SDMMC0_CMD_DATA0_CLKOUT);
 #if 0
 	rk2818_mux_api_set(GPIOF3_APWM1_MMC0DETN_NAME, IOMUXA_SDMMC1_DETECT_N);
-	rk2818_mux_api_set(GPIOH_MMC0D_SEL_NAME, IOMUXA_SDMMC0_DATA123);
-	rk2818_mux_api_set(GPIOH_MMC0_SEL_NAME, IOMUXA_SDMMC0_CMD_DATA0_CLKOUT);
 #endif	
 }
 
diff --git a/drivers/mmc/host/rk2818-sdmmc.c b/drivers/mmc/host/rk2818-sdmmc.c
index e0086a42b3e3..b4642fc57d0f 100644
--- a/drivers/mmc/host/rk2818-sdmmc.c
+++ b/drivers/mmc/host/rk2818-sdmmc.c
@@ -887,11 +887,14 @@ static int rk2818_sdmmc_get_ro(struct mmc_host *mmc)
 
 static int rk2818_sdmmc_get_cd(struct mmc_host *mmc)
 {
+#if !defined(CONFIG_MACH_RAHO)
 	struct rk2818_sdmmc_host *host = mmc_priv(mmc);
 	u32 cdetect = readl(host->regs + SDMMC_CDETECT);
 	
 	return (cdetect & SDMMC_CARD_DETECT_N)?0:1;
-
+#else
+    return 1; //raho°å×Óû½ÓcdÒý½Å£¬¹ÊÕâÀïĬÈ϶¼ÈÏΪÓп¨´æÔÚ¡£¸ÃÇé¿öÏ£¬Ö»ÄÜÔڹػúµÄÇé¿öϲå°Î¿¨²ÅÓÐЧ
+#endif
 }
 
 static void rk2818_sdmmc_enable_sdio_irq(struct mmc_host *mmc, int enable)