[ARM] tegra: stingray: Fix wlan support

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/arch/arm/mach-tegra/board-stingray-wifi.c b/arch/arm/mach-tegra/board-stingray-wifi.c
index 47b0c94ba0bead8d1b6b1f696e04fc004a674a76..482d7dd1de42f2c67973c749d727d8ec5dcd25db 100644 (file)
--- a/arch/arm/mach-tegra/board-stingray-wifi.c
+++ b/arch/arm/mach-tegra/board-stingray-wifi.c
@@ -15,7 +15,7 @@
 #include "gpio-names.h"
 
 #define STINGRAY_WLAN_IRQ      TEGRA_GPIO_PU5
-#define STINGRAY_WLAN_PWR      TEGRA_GPIO_PU3
+#define STINGRAY_WLAN_PWR      TEGRA_GPIO_PU4
 #define STINGRAY_WLAN_RST      TEGRA_GPIO_PU2
 
 #define PREALLOC_WLAN_NUMBER_OF_SECTIONS       4
@@ -127,7 +127,7 @@ struct tegra_sdhci_platform_data stingray_wifi_data = {
        }
 };
 
-int stingray_wifi_set_carddetect(int val)
+static int stingray_wifi_set_carddetect(int val)
 {
        pr_debug("%s: %d\n", __func__, val);
        stingray_wifi_cd = val;
@@ -140,7 +140,7 @@ int stingray_wifi_set_carddetect(int val)
 
 static int stingray_wifi_power_state;
 
-int stingray_wifi_power(int on)
+static int stingray_wifi_power(int on)
 {
        pr_debug("%s: %d\n", __func__, on);
 
@@ -156,7 +156,7 @@ int stingray_wifi_power(int on)
 
 static int stingray_wifi_reset_state;
 
-int stingray_wifi_reset(int on)
+static int stingray_wifi_reset(int on)
 {
        pr_debug("%s: do nothing\n", __func__);
        stingray_wifi_reset_state = on;

diff --git a/arch/arm/mach-tegra/board-stingray.c b/arch/arm/mach-tegra/board-stingray.c
index bc80c04f25d62847b255fb851646328b336b992e..34e62fcc0d580d81d45276eebe35b7d37c0078d5 100644 (file)
--- a/arch/arm/mach-tegra/board-stingray.c
+++ b/arch/arm/mach-tegra/board-stingray.c
@@ -204,7 +204,7 @@ static struct platform_device *stingray_devices[] __initdata = {
        &hsuart,
 };
 
-extern struct tegra_sdhci_platform_data stingray_wifi_data; /* sdhci1 */
+extern struct tegra_sdhci_platform_data stingray_wifi_data; /* sdhci2 */
 
 static struct tegra_sdhci_platform_data stingray_sdhci_platform_data3 = {
        .clk_id = NULL,
@@ -229,11 +229,11 @@ static __initdata struct tegra_clk_init_table stingray_clk_init_table[] = {
 static void stingray_sdhci_init(void)
 {
        /* TODO: setup GPIOs for cd, wd, and power */
-       tegra_sdhci_device1.dev.platform_data = &stingray_wifi_data;
+       tegra_sdhci_device2.dev.platform_data = &stingray_wifi_data;
        tegra_sdhci_device3.dev.platform_data = &stingray_sdhci_platform_data3;
        tegra_sdhci_device4.dev.platform_data = &stingray_sdhci_platform_data4;
 
-       platform_device_register(&tegra_sdhci_device1);
+       platform_device_register(&tegra_sdhci_device2);
        platform_device_register(&tegra_sdhci_device3);
        platform_device_register(&tegra_sdhci_device4);
 }