From 28704e4899153c128788c0768bdfea6fc7348f2f Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 Aug 2010 10:57:58 +0800 Subject: [PATCH] =?utf8?q?raho=20sdcard=20=E6=A3=80=E6=B5=8B=E4=BF=AE?= =?utf8?q?=E6=94=B9=20--raho=20=E6=B2=A1=E6=9C=89cd=E8=84=9A,=E6=95=85?= =?utf8?q?=E5=8F=AA=E8=83=BD=E5=9C=A8=E5=85=B3=E6=9C=BA=E6=83=85=E5=86=B5?= =?utf8?q?=E4=B8=8B=E6=8F=92=E6=8B=94=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- arch/arm/mach-rk2818/board-raho.c | 4 ++-- drivers/mmc/host/rk2818-sdmmc.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) 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) -- 2.34.1