ARM: tegra: tegratab: macallan: rename wifi wow line
Nitin Bindal [Tue, 24 Dec 2013 18:20:55 +0000 (23:20 +0530)]
1. Rename wifi wow line for macallan and tegratab
2. update wl12xx.h

Bug 1430234
Bug 1430017

Change-Id: I0fed73db69152481977ea594d4d856e8a9899516
Signed-off-by: Nitin Bindal <nbindal@nvidia.com>
Reviewed-on: http://git-master/r/349666
Reviewed-by: Gabby Lee <galee@nvidia.com>

arch/arm/mach-tegra/board-macallan-sdhci.c
arch/arm/mach-tegra/board-tegratab-sdhci.c
include/linux/wl12xx.h

index e226da1..86f42d1 100644 (file)
@@ -265,7 +265,7 @@ static int __init macallan_wifi_init(void)
        rc = gpio_request(MACALLAN_WLAN_RST, "wlan_rst");
        if (rc)
                pr_err("WLAN_RST gpio request failed:%d\n", rc);
-       rc = gpio_request(MACALLAN_WLAN_WOW, "bcmsdh_sdmmc");
+       rc = gpio_request(MACALLAN_WLAN_WOW, "wlan_wow");
        if (rc)
                pr_err("WLAN_WOW gpio request failed:%d\n", rc);
 
@@ -279,7 +279,7 @@ static int __init macallan_wifi_init(void)
        if (rc)
                pr_err("WLAN_WOW gpio direction configuration failed:%d\n", rc);
        macallan_wl12xx_wlan_data.irq = gpio_to_irq(MACALLAN_WLAN_WOW);
-               wl12xx_set_platform_data(&macallan_wl12xx_wlan_data);
+       wl12xx_set_platform_data(&macallan_wl12xx_wlan_data);
        return 0;
 }
 
index d455317..fcd5f71 100644 (file)
@@ -270,7 +270,7 @@ static int __init tegratab_wifi_init(void)
        rc = gpio_request(TEGRATAB_WLAN_RST, "wlan_rst");
        if (rc)
                pr_err("WLAN_RST gpio request failed:%d\n", rc);
-       rc = gpio_request(TEGRATAB_WLAN_WOW, "bcmsdh_sdmmc");
+       rc = gpio_request(TEGRATAB_WLAN_WOW, "wlan_wow");
        if (rc)
                pr_err("WLAN_WOW gpio request failed:%d\n", rc);
 
@@ -284,7 +284,7 @@ static int __init tegratab_wifi_init(void)
        if (rc)
                pr_err("WLAN_WOW gpio direction configuration failed:%d\n", rc);
        tegratab_wl12xx_wlan_data.irq = gpio_to_irq(TEGRATAB_WLAN_WOW);
-               wl12xx_set_platform_data(&tegratab_wl12xx_wlan_data);
+       wl12xx_set_platform_data(&tegratab_wl12xx_wlan_data);
        return 0;
 }
 
index 79917ef..d4835ec 100644 (file)
@@ -67,11 +67,12 @@ struct wl12xx_platform_data {
        int (*set_power)(int power_on);
        int (*set_carddetect)(int val);
        /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */
+       int gpio;
        int irq;
        bool use_eeprom;
        int board_ref_clock;
        int board_tcxo_clock;
-       unsigned long platform_quirks;
+       u32 platform_quirks;
        bool pwr_in_suspend;
 
        struct wl1271_if_operations *ops;