summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorSangwook Lee <sangwook.lee@linaro.org>2011-11-07 18:05:22 +0100
committerChris Ball <cjb@laptop.org>2012-01-12 05:58:43 +0100
commitfa1773cc5b78faa1ef0ab1ab0f48bce7bc72cec5 (patch)
tree9cbf08ea4948c32dea45bfa036870dd8414f3598 /drivers/mmc
parentmmc: allow upper layers to know immediately if card has been removed (diff)
downloadlinux-fa1773cc5b78faa1ef0ab1ab0f48bce7bc72cec5.tar.xz
linux-fa1773cc5b78faa1ef0ab1ab0f48bce7bc72cec5.zip
mmc: sdhci-s3c: Add pm_caps into SD/MMC host
sdhci-s3c updates pm_caps from platform data for SDIO PM. Signed-off-by: Sangwook Lee <sangwook.lee@samsung.com> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci-s3c.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 55c1e870da83..b6558b829a9c 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -524,6 +524,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
if (pdata->host_caps)
host->mmc->caps |= pdata->host_caps;
+ if (pdata->pm_caps)
+ host->mmc->pm_caps |= pdata->pm_caps;
+
host->quirks |= (SDHCI_QUIRK_32BIT_DMA_ADDR |
SDHCI_QUIRK_32BIT_DMA_SIZE);