Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36' into develop-2...

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / host / sdhci-tegra.c

diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index a0b9750eb8dd02862eb6d76b0ccfdc6f0ea95832..793915f8b239cd08777bd71a5714b03592f3b032 100644 (file)
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -186,6 +186,9 @@ static int __devinit tegra_sdhci_probe(struct platform_device *pdev)
        if (plat->mmc_data.built_in)
                sdhci->mmc->pm_flags = MMC_PM_KEEP_POWER | MMC_PM_IGNORE_PM_NOTIFY;
 
+       if (plat->rt_disable != 0)
+               sdhci->quirks |= SDHCI_QUIRK_RUNTIME_DISABLE;
+
        rc = sdhci_add_host(sdhci);
        if (rc)
                goto err_clk_disable;