adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-04 07:03:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

omap_hsmmc: Wait for SDBP

Browse source 
It is necessary to wait for bus power before sending
any commands.

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
Adrian Hunter 2009-03-12 17:08:26 +02:00 committed by Pierre Ossman
parent f3e2f1dd3b
commit e13bb3003a
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/mmc/host/omap_hsmmc.c
View file

@ -498,6 +498,19 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void set_sd_bus_power(struct mmc_omap_host *host)
{
unsigned long i;
OMAP_HSMMC_WRITE(host->base, HCTL,
OMAP_HSMMC_READ(host->base, HCTL) | SDBP);
for (i = 0; i < loops_per_jiffy; i++) {
if (OMAP_HSMMC_READ(host->base, HCTL) & SDBP)
break;
cpu_relax();
}
}
/* /*
* Switch MMC interface voltage ... only relevant for MMC1. * Switch MMC interface voltage ... only relevant for MMC1.
* *
@ -554,9 +567,7 @@ static int omap_mmc_switch_opcond(struct mmc_omap_host *host, int vdd)
reg_val |= SDVS30; reg_val |= SDVS30;
OMAP_HSMMC_WRITE(host->base, HCTL, reg_val); OMAP_HSMMC_WRITE(host->base, HCTL, reg_val);
set_sd_bus_power(host);
OMAP_HSMMC_WRITE(host->base, HCTL,
OMAP_HSMMC_READ(host->base, HCTL) | SDBP);
return 0; return 0;
err: err:
@ -942,8 +953,7 @@ static void omap_hsmmc_init(struct mmc_omap_host *host)
OMAP_HSMMC_WRITE(host->base, SYSCONFIG, value | AUTOIDLE); OMAP_HSMMC_WRITE(host->base, SYSCONFIG, value | AUTOIDLE);
/* Set SD bus power bit */ /* Set SD bus power bit */
value = OMAP_HSMMC_READ(host->base, HCTL); set_sd_bus_power(host);
OMAP_HSMMC_WRITE(host->base, HCTL, value | SDBP);
} }
static struct mmc_host_ops mmc_omap_ops = { static struct mmc_host_ops mmc_omap_ops = {