diff options
| author | Mursalin Akon <makon@nvidia.com> | 2012-03-16 17:59:14 -0700 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-03-30 09:12:48 -0700 |
| commit | 0cb87f8335b7bce04e1851506156f592dfb052be (patch) | |
| tree | 8217056cb693f36781f096d808b3d21cfc6bb193 | |
| parent | 78f6d67dc8c508ba352a10e6c13abc06cf6f63ab (diff) | |
mmc:host: add pm_caps and pm_flags to platform data
Initialize pm_caps and pm_flags through platform
data.
Bug 956238
Change-Id: I400f6e92541fa2e63ccc7f829e204d5eef4697fc
Signed-off-by: Mursalin Akon <makon@nvidia.com>
Reviewed-on: http://git-master/r/90790
Reviewed-by: Automatic_Commit_Validation_User
Tested-by: Gerrit_Virtual_Submit
Reviewed-by: Allen Martin <amartin@nvidia.com>
| -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; |