diff options
| -rw-r--r-- | arch/arm/mach-tegra/board-dalmore-sdhci.c | 95 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-pluto-sdhci.c | 105 |
2 files changed, 4 insertions, 196 deletions
diff --git a/arch/arm/mach-tegra/board-dalmore-sdhci.c b/arch/arm/mach-tegra/board-dalmore-sdhci.c index 6a1eccae931e..a2d7a927df0f 100644 --- a/arch/arm/mach-tegra/board-dalmore-sdhci.c +++ b/arch/arm/mach-tegra/board-dalmore-sdhci.c @@ -36,8 +36,6 @@ #include "board.h" #include "board-dalmore.h" - -#if defined(CONFIG_ARCH_TEGRA_11x_SOC) #define DALMORE_WLAN_PWR TEGRA_GPIO_PCC5 #define DALMORE_WLAN_RST TEGRA_GPIO_PX7 #define DALMORE_WLAN_WOW TEGRA_GPIO_PU5 @@ -309,96 +307,3 @@ int __init dalmore_sdhci_init(void) dalmore_wifi_init(); return 0; } - -#else -#define DALMORE_SD_CD TEGRA_GPIO_PI5 -#define DALMORE_SD_WP TEGRA_GPIO_PT3 -static struct resource sdhci_resource0[] = { - [0] = { - .start = INT_SDMMC1, - .end = INT_SDMMC1, - .flags = IORESOURCE_IRQ, - }, - [1] = { - .start = TEGRA_SDMMC1_BASE, - .end = TEGRA_SDMMC1_BASE + TEGRA_SDMMC1_SIZE-1, - .flags = IORESOURCE_MEM, - }, -}; - -static struct resource sdhci_resource3[] = { - [0] = { - .start = INT_SDMMC4, - .end = INT_SDMMC4, - .flags = IORESOURCE_IRQ, - }, - [1] = { - .start = TEGRA_SDMMC4_BASE, - .end = TEGRA_SDMMC4_BASE + TEGRA_SDMMC4_SIZE-1, - .flags = IORESOURCE_MEM, - }, -}; - -static struct tegra_sdhci_platform_data tegra_sdhci_platform_data0 = { - .cd_gpio = DALMORE_SD_CD, - .wp_gpio = -1, - .power_gpio = -1, - .tap_delay = 0x0F, - .ddr_clk_limit = 41000000, -/* .is_voltage_switch_supported = true, - .vdd_rail_name = "vddio_sdmmc1", - .slot_rail_name = "vddio_sd_slot", - .vdd_max_uv = 3320000, - .vdd_min_uv = 3280000, - .max_clk = 208000000, - .is_8bit_supported = false, */ -}; - -static struct tegra_sdhci_platform_data tegra_sdhci_platform_data3 = { - .cd_gpio = -1, - .wp_gpio = -1, - .power_gpio = -1, - .is_8bit = 1, - .tap_delay = 0x0F, - .ddr_clk_limit = 41000000, - .mmc_data = { - .built_in = 1, - } -/* .is_voltage_switch_supported = false, - .vdd_rail_name = NULL, - .slot_rail_name = NULL, - .vdd_max_uv = -1, - .vdd_min_uv = -1, - .max_clk = 48000000, - .is_8bit_supported = true, */ -}; - -static struct platform_device tegra_sdhci_device0 = { - .name = "sdhci-tegra", - .id = 0, - .resource = sdhci_resource0, - .num_resources = ARRAY_SIZE(sdhci_resource0), - .dev = { - .platform_data = &tegra_sdhci_platform_data0, - }, -}; - - -static struct platform_device tegra_sdhci_device3 = { - .name = "sdhci-tegra", - .id = 3, - .resource = sdhci_resource3, - .num_resources = ARRAY_SIZE(sdhci_resource3), - .dev = { - .platform_data = &tegra_sdhci_platform_data3, - }, -}; - - -int __init dalmore_sdhci_init(void) -{ - platform_device_register(&tegra_sdhci_device3); - platform_device_register(&tegra_sdhci_device0); - return 0; -} -#endif diff --git a/arch/arm/mach-tegra/board-pluto-sdhci.c b/arch/arm/mach-tegra/board-pluto-sdhci.c index f61d07a25089..61081472f689 100644 --- a/arch/arm/mach-tegra/board-pluto-sdhci.c +++ b/arch/arm/mach-tegra/board-pluto-sdhci.c @@ -28,17 +28,16 @@ #include <mach/irqs.h> #include <mach/iomap.h> #include <mach/sdhci.h> -#include<mach/gpio-tegra.h> +#include <mach/gpio-tegra.h> #include <mach/io_dpd.h> #include "gpio-names.h" #include "board.h" #include "board-pluto.h" -#if defined(CONFIG_ARCH_TEGRA_11x_SOC) -#define DALMORE_WLAN_PWR TEGRA_GPIO_PCC5 -#define DALMORE_WLAN_RST TEGRA_GPIO_PX7 -#define DALMORE_WLAN_WOW TEGRA_GPIO_PU5 +#define PLUTO_WLAN_PWR TEGRA_GPIO_PCC5 +#define PLUTO_WLAN_RST TEGRA_GPIO_PX7 +#define PLUTO_WLAN_WOW TEGRA_GPIO_PU5 static void (*wifi_status_cb)(int card_present, void *dev_id); static void *wifi_status_cb_devid; static int pluto_wifi_status_register(void (*callback)(int , void *), void *); @@ -307,99 +306,3 @@ int __init pluto_sdhci_init(void) pluto_wifi_init(); return 0; } - -#else -#define PLUTO_SD_CD TEGRA_GPIO_PI5 -#define PLUTO_SD_WP TEGRA_GPIO_PT3 -static struct resource sdhci_resource0[] = { - [0] = { - .start = INT_SDMMC1, - .end = INT_SDMMC1, - .flags = IORESOURCE_IRQ, - }, - [1] = { - .start = TEGRA_SDMMC1_BASE, - .end = TEGRA_SDMMC1_BASE + TEGRA_SDMMC1_SIZE-1, - .flags = IORESOURCE_MEM, - }, -}; - - -static struct resource sdhci_resource3[] = { - [0] = { - .start = INT_SDMMC4, - .end = INT_SDMMC4, - .flags = IORESOURCE_IRQ, - }, - [1] = { - .start = TEGRA_SDMMC4_BASE, - .end = TEGRA_SDMMC4_BASE + TEGRA_SDMMC4_SIZE-1, - .flags = IORESOURCE_MEM, - }, -}; - - -static struct tegra_sdhci_platform_data tegra_sdhci_platform_data0 = { - .cd_gpio = PLUTO_SD_CD, - .wp_gpio = -1, - .power_gpio = -1, - .tap_delay = 0x0F, - .ddr_clk_limit = 41000000, -/* .is_voltage_switch_supported = true, - .vdd_rail_name = "vddio_sdmmc1", - .slot_rail_name = "vddio_sd_slot", - .vdd_max_uv = 3320000, - .vdd_min_uv = 3280000, - .max_clk = 208000000, - .is_8bit_supported = false, */ -}; - -static struct tegra_sdhci_platform_data tegra_sdhci_platform_data3 = { - .cd_gpio = -1, - .wp_gpio = -1, - .power_gpio = -1, - .is_8bit = 1, - .tap_delay = 0x0F, - .ddr_clk_limit = 41000000, - .mmc_data = { - .built_in = 1, - } -/* .is_voltage_switch_supported = false, - .vdd_rail_name = NULL, - .slot_rail_name = NULL, - .vdd_max_uv = -1, - .vdd_min_uv = -1, - .max_clk = 48000000, - .is_8bit_supported = true, */ -}; - -static struct platform_device tegra_sdhci_device0 = { - .name = "sdhci-tegra", - .id = 0, - .resource = sdhci_resource0, - .num_resources = ARRAY_SIZE(sdhci_resource0), - .dev = { - .platform_data = &tegra_sdhci_platform_data0, - }, -}; - - -static struct platform_device tegra_sdhci_device3 = { - .name = "sdhci-tegra", - .id = 3, - .resource = sdhci_resource3, - .num_resources = ARRAY_SIZE(sdhci_resource3), - .dev = { - .platform_data = &tegra_sdhci_platform_data3, - }, -}; - - -int __init pluto_sdhci_init(void) -{ - platform_device_register(&tegra_sdhci_device3); - platform_device_register(&tegra_sdhci_device0); - - return 0; -} -#endif |