From b46501b85169b042e50b0f60bdc14460e688b6ba Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Tue, 24 Feb 2009 14:48:16 +0200 Subject: [PATCH] --- yaml --- r: 140461 b: refs/heads/master c: 9e57d60829f5c00ebf44df65a4b709359e285c20 h: refs/heads/master i: 140459: 0ca886bed0a5bfcd61e76327e1f5a509c2fb5345 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/omap_hsmmc.c | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 323fd14e6be5..bf3601791f03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 736bb6bb01a2a180b6f062e792bd03658d57ab7e +refs/heads/master: 9e57d60829f5c00ebf44df65a4b709359e285c20 diff --git a/trunk/drivers/mmc/host/omap_hsmmc.c b/trunk/drivers/mmc/host/omap_hsmmc.c index a631c81dce12..303a7970806d 100644 --- a/trunk/drivers/mmc/host/omap_hsmmc.c +++ b/trunk/drivers/mmc/host/omap_hsmmc.c @@ -485,9 +485,6 @@ static int omap_mmc_switch_opcond(struct mmc_omap_host *host, int vdd) u32 reg_val = 0; int ret; - if (host->id != OMAP_MMC1_DEVID) - return 0; - /* Disable the clocks */ clk_disable(host->fclk); clk_disable(host->iclk); @@ -786,20 +783,6 @@ static void omap_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) switch (ios->power_mode) { case MMC_POWER_OFF: mmc_slot(host).set_power(host->dev, host->slot_id, 0, 0); - /* - * Reset interface voltage to 3V if it's 1.8V now; - * only relevant on MMC-1, the others always use 1.8V. - * - * REVISIT: If we are able to detect cards after unplugging - * a 1.8V card, this code should not be needed. - */ - if (host->id != OMAP_MMC1_DEVID) - break; - if (!(OMAP_HSMMC_READ(host->base, HCTL) & SDVSDET)) { - int vdd = fls(host->mmc->ocr_avail) - 1; - if (omap_mmc_switch_opcond(host, vdd) != 0) - host->mmc->ios.vdd = vdd; - } break; case MMC_POWER_UP: mmc_slot(host).set_power(host->dev, host->slot_id, 1, ios->vdd);