diff options
| author | Anthony Felice <tony.felice@timesys.com> | 2013-04-26 17:47:40 -0400 |
|---|---|---|
| committer | Anthony Felice <tony.felice@timesys.com> | 2013-04-26 17:47:40 -0400 |
| commit | 74718305534c6f1d9aaca73985d200007f29eca8 (patch) | |
| tree | 3561ce36013a72900cfe4dcb1caed90f9a68dad5 | |
| parent | 5fd6b7285c33ab549db3277afe637dfdda5232a0 (diff) | |
Fix SDHC card timeout error.3.0-vybrid-ts2.3
| -rw-r--r-- | arch/arm/plat-mxc/pit.c | 3 | ||||
| -rwxr-xr-x | drivers/mmc/host/sdhci.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/pit.c b/arch/arm/plat-mxc/pit.c index e82cca9d06ea..1e350b950b9f 100644 --- a/arch/arm/plat-mxc/pit.c +++ b/arch/arm/plat-mxc/pit.c @@ -217,7 +217,8 @@ static struct irqaction pit_timer_irq = { static struct clock_event_device clockevent_pit = { .name = "pit", - .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, + //.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, + .features = CLOCK_EVT_FEAT_PERIODIC, .shift = 32, .set_mode = pit_set_mode, .set_next_event = pit_set_next_event, diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 189dff37e84e..a3422f96c16d 100755 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2658,7 +2658,11 @@ int sdhci_add_host(struct sdhci_host *host) } else mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_200; +#ifdef CONFIG_ARCH_MVF + mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE; +#else mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23; +#endif if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12) host->flags |= SDHCI_AUTO_CMD12; |