From: 黄涛 <huangtao@rock-chips.com>
Date: Sun, 31 Jul 2011 16:17:16 +0000 (+0800)
Subject: Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36' into develop-2... 
X-Git-Tag: firefly_0821_release~9833
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=a01580d71e50e345388faabf6939673cd1bae7ed;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/wireless/bcm4329/dhd_common.c
	drivers/net/wireless/bcm4329/dhd_custom_gpio.c
---

a01580d71e50e345388faabf6939673cd1bae7ed
diff --cc drivers/mmc/host/sdhci-tegra.c
index a0b9750eb8dd,1ccd8c70ab14..793915f8b239
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@@ -182,10 -143,9 +182,13 @@@ static int __devinit tegra_sdhci_probe(
  	if (plat->force_hs != 0)
  		sdhci->quirks |= SDHCI_QUIRK_FORCE_HIGH_SPEED_MODE;
  
 +	sdhci->mmc->pm_caps = MMC_PM_KEEP_POWER | MMC_PM_IGNORE_PM_NOTIFY;
 +	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;