diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-06-23 16:45:48 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:46:28 -0800 |
| commit | db6c3650635a0e9a838deaef6f446b7d501229c3 (patch) | |
| tree | 4c96a8512e18e7e1ceb8860717f7a1c6ddb39205 /arch/arm/mach-tegra/board-whistler-sdhci.c | |
| parent | e1a7d85ba067265a6e059624f7d9cc6be9e060f7 (diff) | |
ARM: tegra: Whistler K39 updates
Rebase-Id: Ra87c1d4245a0ce31e3fe7529f06ca18fbe703706
Diffstat (limited to 'arch/arm/mach-tegra/board-whistler-sdhci.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler-sdhci.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/mach-tegra/board-whistler-sdhci.c b/arch/arm/mach-tegra/board-whistler-sdhci.c index 8933864a6742..b5f64a98e61d 100644 --- a/arch/arm/mach-tegra/board-whistler-sdhci.c +++ b/arch/arm/mach-tegra/board-whistler-sdhci.c @@ -67,24 +67,18 @@ static struct resource sdhci_resource3[] = { }; static struct tegra_sdhci_platform_data tegra_sdhci_platform_data0 = { - .clk_id = NULL, - .force_hs = 0, .cd_gpio = -1, .wp_gpio = -1, .power_gpio = -1, }; static struct tegra_sdhci_platform_data tegra_sdhci_platform_data2 = { - .clk_id = NULL, - .force_hs = 0, .cd_gpio = WHISTLER_EXT_SDCARD_DETECT, .wp_gpio = -1, .power_gpio = -1, }; static struct tegra_sdhci_platform_data tegra_sdhci_platform_data3 = { - .clk_id = NULL, - .force_hs = 0, .cd_gpio = -1, .wp_gpio = -1, .power_gpio = -1, @@ -124,15 +118,7 @@ int __init whistler_sdhci_init(void) { int ret; - ret = gpio_request(WHISTLER_EXT_SDCARD_DETECT, "card_detect"); - if (ret < 0) { - tegra_sdhci_platform_data2.cd_gpio = -1; - pr_err("card_detect gpio not found\n"); - } - else { - tegra_gpio_enable(WHISTLER_EXT_SDCARD_DETECT); - gpio_direction_input(WHISTLER_EXT_SDCARD_DETECT); - } + tegra_gpio_enable(WHISTLER_EXT_SDCARD_DETECT); platform_device_register(&tegra_sdhci_device3); platform_device_register(&tegra_sdhci_device2); |