diff options
| author | Venkat Rao <vrao@broadcom.com> | 2011-03-26 01:37:47 +0100 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-05-25 02:59:30 +0200 |
| commit | c7f409e39e65cb007304da718b0a7b25a0144a0a (patch) | |
| tree | f835f6e38b48e8ea5fad8c18be03071cf833c599 | |
| parent | mmc: remove redundant irq disabling (diff) | |
| download | linux-c7f409e39e65cb007304da718b0a7b25a0144a0a.tar.xz linux-c7f409e39e65cb007304da718b0a7b25a0144a0a.zip | |
mmc: tegra: add pm_flags
Enable fast bcm4329 WIFI suspend/resume on Tegra2 board.
This patch allows the mach-tegra support to tell the tegra MMC host
controller to NOT turn off power for the MMC controller the WIFI part
lives behind. Thus bcm4329 firmware doesn't need to be reloaded.
Signed-off-by: Venkat Rao <vrao@broadcom.com>
Tested-by: Grant Grundler <grundler@chromium.org>
Reviewed-by: Olof Johansson <olof@lixom.net>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Chris Ball <cjb@laptop.org>
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/sdhci.h | 1 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-tegra.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h b/arch/arm/mach-tegra/include/mach/sdhci.h index 3ad086e859c3..4231bc7b8652 100644 --- a/arch/arm/mach-tegra/include/mach/sdhci.h +++ b/arch/arm/mach-tegra/include/mach/sdhci.h @@ -24,6 +24,7 @@ struct tegra_sdhci_platform_data { int wp_gpio; int power_gpio; int is_8bit; + int pm_flags; }; #endif diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index f7e1f964395f..343c97edba32 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -184,6 +184,8 @@ static int tegra_sdhci_pltfm_init(struct sdhci_host *host, clk_enable(clk); pltfm_host->clk = clk; + host->mmc->pm_caps = plat->pm_flags; + if (plat->is_8bit) host->mmc->caps |= MMC_CAP_8_BIT_DATA; |