From: Dmitry Shmidt <dimitrysh@google.com>
Date: Tue, 18 May 2010 17:53:41 +0000 (-0700)
Subject: [ARM] tegra: stingray: Fix wlan support
X-Git-Tag: firefly_0821_release~9834^2~910
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8f07c26ddec14318cf929ccb88eb2a89f4426bbe;p=firefly-linux-kernel-4.4.55.git

[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 47b0c94ba0be..482d7dd1de42 100644
--- 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 bc80c04f25d6..34e62fcc0d58 100644
--- 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);
 }