diff options
| author | Mursalin Akon <makon@nvidia.com> | 2012-03-16 11:15:56 -0700 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-04-16 03:09:48 -0700 |
| commit | 7d23fc1970979f5f51baef3fc890e0618ad45e8f (patch) | |
| tree | 25e5f6f16def61175281ec17c439e04f16e11097 /arch/arm/mach-tegra/board-kai-sdhci.c | |
| parent | 07ef11654509bbbf243c783ad884c858b001182c (diff) | |
arm:tegra[3]: make embedded_sdio platform data conditional
embedded_sdio is used, iff MMC_EMBEDDED_SDIO
Kconfig is on. This CL makes it explicit.
Additionally, for SDIO sdhci always keep the power on.
Bug 956238
Change-Id: I44e484b0705b50f942f177ee8d95fb363f38b8c1
Signed-off-by: Mursalin Akon <makon@nvidia.com>
Reviewed-on: http://git-master/r/90670
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-kai-sdhci.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-kai-sdhci.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-kai-sdhci.c b/arch/arm/mach-tegra/board-kai-sdhci.c index 3e4899271085..9c857a7798a6 100644 --- a/arch/arm/mach-tegra/board-kai-sdhci.c +++ b/arch/arm/mach-tegra/board-kai-sdhci.c @@ -101,6 +101,7 @@ static struct resource sdhci_resource3[] = { }, }; +#ifdef CONFIG_MMC_EMBEDDED_SDIO static struct embedded_sdio_data embedded_sdio_data2 = { .cccr = { .sdio_vsn = 2, @@ -115,13 +116,19 @@ static struct embedded_sdio_data embedded_sdio_data2 = { .device = 0x4076, }, }; +#endif static struct tegra_sdhci_platform_data tegra_sdhci_platform_data2 = { .mmc_data = { .register_status_notify = kai_wifi_status_register, +#ifdef CONFIG_MMC_EMBEDDED_SDIO /* .embedded_sdio = &embedded_sdio_data2, */ +#endif .built_in = 1, }, +#ifndef CONFIG_MMC_EMBEDDED_SDIO + .pm_flags = MMC_PM_KEEP_POWER, +#endif .cd_gpio = -1, .wp_gpio = -1, .power_gpio = -1, |