diff options
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/sdhci.h | 1 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h b/arch/arm/mach-tegra/include/mach/sdhci.h index d360f6f04949..b48a92887070 100644 --- a/arch/arm/mach-tegra/include/mach/sdhci.h +++ b/arch/arm/mach-tegra/include/mach/sdhci.h @@ -26,6 +26,7 @@ struct tegra_sdhci_platform_data { int power_gpio; int is_8bit; int pm_flags; + int pm_caps; unsigned int max_clk_limit; unsigned int tap_delay; struct mmc_platform_data mmc_data; diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 2276fdeec50f..4dfe8176308c 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -1063,7 +1063,8 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev) tegra_host->instance = pdev->id; tegra_host->dpd = tegra_io_dpd_get(mmc_dev(host->mmc)); - host->mmc->pm_caps = plat->pm_flags; + host->mmc->pm_caps |= plat->pm_caps; + host->mmc->pm_flags |= plat->pm_flags; host->mmc->caps |= MMC_CAP_ERASE; host->mmc->caps |= MMC_CAP_DISABLE; |