diff options
author | Mayuresh Kulkarni <mkulkarni@nvidia.com> | 2011-09-20 17:01:17 +0530 |
---|---|---|
committer | Varun Colbert <vcolbert@nvidia.com> | 2011-09-20 17:03:44 -0700 |
commit | f6c509f93d1f16368d969f2fead139833d9dad6a (patch) | |
tree | 1f7eb3773936cf15b7a4ed0cd383aec86761cb18 /arch/arm | |
parent | 31cf5800078bf343c7ca942b59b7c0a30b5ed8c6 (diff) |
arm: tegra: ventana: set built_in flag to true for eMMC and SDIO
for bug 876057
Change-Id: Ic636bee0bcd81268d12c259fa0d0a22f301272a9
Signed-off-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-on: http://git-master/r/53448
Reviewed-by: Pavan Kunapuli <pkunapuli@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-tegra/board-ventana-sdhci.c | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/arch/arm/mach-tegra/board-ventana-sdhci.c b/arch/arm/mach-tegra/board-ventana-sdhci.c index 72b283681c3c..a72271e681a7 100644 --- a/arch/arm/mach-tegra/board-ventana-sdhci.c +++ b/arch/arm/mach-tegra/board-ventana-sdhci.c @@ -44,24 +44,24 @@ static int ventana_wifi_power(int on); static int ventana_wifi_set_carddetect(int val); static struct wifi_platform_data ventana_wifi_control = { - .set_power = ventana_wifi_power, - .set_reset = ventana_wifi_reset, + .set_power = ventana_wifi_power, + .set_reset = ventana_wifi_reset, .set_carddetect = ventana_wifi_set_carddetect, }; static struct platform_device ventana_wifi_device = { - .name = "bcm4329_wlan", - .id = 1, - .dev = { + .name = "bcm4329_wlan", + .id = 1, + .dev = { .platform_data = &ventana_wifi_control, }, }; static struct resource sdhci_resource0[] = { [0] = { - .start = INT_SDMMC1, - .end = INT_SDMMC1, - .flags = IORESOURCE_IRQ, + .start = INT_SDMMC1, + .end = INT_SDMMC1, + .flags = IORESOURCE_IRQ, }, [1] = { .start = TEGRA_SDMMC1_BASE, @@ -72,9 +72,9 @@ static struct resource sdhci_resource0[] = { static struct resource sdhci_resource2[] = { [0] = { - .start = INT_SDMMC3, - .end = INT_SDMMC3, - .flags = IORESOURCE_IRQ, + .start = INT_SDMMC3, + .end = INT_SDMMC3, + .flags = IORESOURCE_IRQ, }, [1] = { .start = TEGRA_SDMMC3_BASE, @@ -85,9 +85,9 @@ static struct resource sdhci_resource2[] = { static struct resource sdhci_resource3[] = { [0] = { - .start = INT_SDMMC4, - .end = INT_SDMMC4, - .flags = IORESOURCE_IRQ, + .start = INT_SDMMC4, + .end = INT_SDMMC4, + .flags = IORESOURCE_IRQ, }, [1] = { .start = TEGRA_SDMMC4_BASE, @@ -98,16 +98,16 @@ static struct resource sdhci_resource3[] = { static struct embedded_sdio_data embedded_sdio_data0 = { .cccr = { - .sdio_vsn = 2, - .multi_block = 1, - .low_speed = 0, - .wide_bus = 0, - .high_power = 1, - .high_speed = 1, + .sdio_vsn = 2, + .multi_block = 1, + .low_speed = 0, + .wide_bus = 0, + .high_power = 1, + .high_speed = 1, }, .cis = { - .vendor = 0x02d0, - .device = 0x4329, + .vendor = 0x02d0, + .device = 0x4329, }, }; @@ -115,6 +115,7 @@ static struct tegra_sdhci_platform_data tegra_sdhci_platform_data0 = { .mmc_data = { .register_status_notify = ventana_wifi_status_register, .embedded_sdio = &embedded_sdio_data0, + .built_in = 1, }, .cd_gpio = -1, .wp_gpio = -1, @@ -131,6 +132,9 @@ static struct tegra_sdhci_platform_data tegra_sdhci_platform_data3 = { .cd_gpio = -1, .wp_gpio = -1, .power_gpio = TEGRA_GPIO_PI6, + .mmc_data = { + .built_in = 1, + } }; static struct platform_device tegra_sdhci_device0 = { |