summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Felice <tony.felice@timesys.com>2013-04-26 17:42:46 -0400
committerAnthony Felice <tony.felice@timesys.com>2013-04-26 17:42:46 -0400
commitcb544c7be05d753a823f1a6055855d2ec6d5edae (patch)
treeef201878200df47cdc7bca28aea4bdd94c272779
parent21ceb093d796e94500502eee94a8cd5fcc76f619 (diff)
Fix SDHC card timeout error.3.0-pcm052-ts2.2
-rw-r--r--arch/arm/plat-mxc/pit.c3
-rwxr-xr-xdrivers/mmc/host/sdhci.c4
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;