mmc:host: add pm_caps and pm_flags to platform data
Mursalin Akon [Sat, 17 Mar 2012 00:59:14 +0000 (17:59 -0700)]
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>

arch/arm/mach-tegra/include/mach/sdhci.h
drivers/mmc/host/sdhci-tegra.c

index d360f6f..b48a928 100644 (file)
@@ -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;
index 2276fde..4dfe817 100644 (file)
@@ -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;