diff options
author | Madhusudhan Chikkature <madhu.cr@ti.com> | 2009-12-01 19:25:27 +0530 |
---|---|---|
committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2009-12-01 19:25:27 +0530 |
commit | 0d12da937bcb5ad6fdda07dae90f586b234a1780 (patch) | |
tree | b157768d70baf0fc5df3bae297efdd528129d8d1 | |
parent | 8dc29b35c96aefaf943695857e603cf5f1dcc259 (diff) |
Omap4:Handle hsmmc card detect
Return success for hsmmc2/3/4/5 card detect as they are nonremovable.
Signed-off-by: Madhusudhan Chikkature <madhu.cr@ti.com>
-rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 322f8607d433..748612a1827c 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1002,8 +1002,11 @@ static int omap_hsmmc_get_cd(struct mmc_host *mmc) struct omap_mmc_platform_data *pdata = host->pdata; /* Since EMMC is not hotpluggable no card detect is required */ - if (host->id == OMAP_MMC2_DEVID) - return 1 ; + if (cpu_is_omap44xx()) { + if (host->id != OMAP_MMC1_DEVID) + return 1 ; + } + if (!pdata->slots[0].card_detect) return -ENOSYS; return pdata->slots[0].card_detect(pdata->slots[0].card_detect_irq); |