diff options
| author | Rich Schmitt <B43082@freescale.com> | 2014-10-31 15:03:32 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:39:21 (GMT) |
| commit | 0b18afe44faef1516f66168bbf782ebad4040006 (patch) | |
| tree | 1c0fd882a9dd5476a835b410109ca9ebbd95278e /drivers/mmc | |
| parent | 23fd3e4bab3478f2b620732c0a4e07b3567b9f1c (diff) | |
| parent | bbadd4637d89b404a1b6a539ea72b37d4a748001 (diff) | |
| download | linux-fsl-qoriq-0b18afe44faef1516f66168bbf782ebad4040006.tar.xz | |
Integrate t1024 patches
Merge remote-tracking branch 't1024-linux/master'
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-pltfm.c | 1 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index 2512c11..095c2a6 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -103,6 +103,7 @@ void sdhci_get_of_property(struct platform_device *pdev) if (of_device_is_compatible(np, "fsl,p5020-esdhc") || of_device_is_compatible(np, "fsl,p5040-esdhc") || + of_device_is_compatible(np, "fsl,t1024-esdhc") || of_device_is_compatible(np, "fsl,t1040-esdhc")) host->quirks2 |= SDHCI_QUIRK2_LONG_TIME_CMD_COMPLETE_IRQ; diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 637c52f..7efa4d1 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2832,6 +2832,9 @@ int sdhci_add_host(struct sdhci_host *host) if (host->quirks2 & SDHCI_QUIRK2_CIRCUIT_SUPPORT_VS33) caps[0] = caps[0] | SDHCI_CAN_VDD_330; + if (host->quirks2 & SDHCI_QUIRK2_NO_1_8_V) + caps[0] &= ~(SDHCI_CAN_VDD_300 | SDHCI_CAN_VDD_180); + if (host->quirks & SDHCI_QUIRK_FORCE_DMA) host->flags |= SDHCI_USE_SDMA; else if (!(caps[0] & SDHCI_CAN_DO_SDMA)) |