mmc: omap_hsmmc: Use OMAP_HSMMC_SUPPORTS_DUAL_VOLT flag to remove host->id based...
authorBalaji T K <balajitk@ti.com>
Wed, 7 Mar 2012 14:55:30 +0000 (09:55 -0500)
committerChris Ball <cjb@laptop.org>
Tue, 27 Mar 2012 16:20:00 +0000 (12:20 -0400)
Use OMAP_HSMMC_SUPPORTS_DUAL_VOLT flag instead of host->id
for identifying SD bus voltage capabilities.

Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Tested-by: Venkatraman S <svenkatr@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/omap_hsmmc.c

index 3f77fd94e5d8c5594724d7ae78fb8cb56ba29d7d..cfb4b48c212b2f7283ad005cea56384953cff5ad 100644 (file)
@@ -650,7 +650,7 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host)
        OMAP_HSMMC_WRITE(host->base, SYSCONFIG,
                        OMAP_HSMMC_READ(host->base, SYSCONFIG) | AUTOIDLE);
 
-       if (host->id == OMAP_MMC1_DEVID) {
+       if (host->pdata->controller_flags & OMAP_HSMMC_SUPPORTS_DUAL_VOLT) {
                if (host->power_mode != MMC_POWER_OFF &&
                    (1 << ios->vdd) <= MMC_VDD_23_24)
                        hctl = SDVS18;