summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorShengzhou Liu <Shengzhou.Liu@freescale.com>2014-09-29 09:22:43 (GMT)
committerMatthew Weigel <Matthew.Weigel@freescale.com>2014-12-11 18:39:14 (GMT)
commit9339df5056af76d7cb58afcac704100b3f8a647c (patch)
tree5924a64dc732f857d6a5e1811133dc945b6af80e /drivers/mmc
parentcee0067665561edaf8d9bd450f2e4f712ed2f667 (diff)
downloadlinux-fsl-qoriq-9339df5056af76d7cb58afcac704100b3f8a647c.tar.xz
powerpc/t1024: some update for t1024
- enable mixed mode of MPIC for deep sleep - add deep sleep support for t1024 - add SDXC support for T1024QDS - add TDM node in dts for Maxim DS26522 Riser card. Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com> Signed-off-by: Xie Xiaobo <X.Xie@freescale.com> Signed-off-by: Zhao Qiang <B45475@freescale.com> Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com> Change-Id: I9cb45b4a02814a4f4cd0a320510361c424545d44 Reviewed-on: http://git.am.freescale.net:8181/21426 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci-pltfm.c1
-rw-r--r--drivers/mmc/host/sdhci.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index f0b2030..757e28b 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))