wl1251: move power GPIO handling into the driver

Move the power GPIO handling from the board code into
the driver. This is a dependency for device tree support.

Signed-off-by: Sebastian Reichel <sre@debian.org>
Reviewed-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 24f3c1be69a5c940ba4688f6de1a1f4a02c7772e..cf18340eb3bbd5ecc4655cf8c12eb54de1279f2b 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -541,6 +541,8 @@ static void __init pandora_wl1251_init(void)
 
        memset(&pandora_wl1251_pdata, 0, sizeof(pandora_wl1251_pdata));
 
+       pandora_wl1251_pdata.power_gpio = -1;
+
        ret = gpio_request_one(PANDORA_WIFI_IRQ_GPIO, GPIOF_IN, "wl1251 irq");
        if (ret < 0)
                goto fail;

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index e05e740a4426210c4d1f4d008128566529ccc623..ddfc8df83c6a9adf2c0d128c688d16e094708ac2 100644 (file)
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -1173,13 +1173,7 @@ static inline void board_smc91x_init(void)
 
 #endif
 
-static void rx51_wl1251_set_power(bool enable)
-{
-       gpio_set_value(RX51_WL1251_POWER_GPIO, enable);
-}
-
 static struct gpio rx51_wl1251_gpios[] __initdata = {
-       { RX51_WL1251_POWER_GPIO, GPIOF_OUT_INIT_LOW,   "wl1251 power"  },
        { RX51_WL1251_IRQ_GPIO,   GPIOF_IN,             "wl1251 irq"    },
 };
 
@@ -1196,17 +1190,16 @@ static void __init rx51_init_wl1251(void)
        if (irq < 0)
                goto err_irq;
 
-       wl1251_pdata.set_power = rx51_wl1251_set_power;
+       wl1251_pdata.power_gpio = RX51_WL1251_POWER_GPIO;
        rx51_peripherals_spi_board_info[RX51_SPI_WL1251].irq = irq;
 
        return;
 
 err_irq:
        gpio_free(RX51_WL1251_IRQ_GPIO);
-       gpio_free(RX51_WL1251_POWER_GPIO);
 error:
        printk(KERN_ERR "wl1251 board initialisation failed\n");
-       wl1251_pdata.set_power = NULL;
+       wl1251_pdata.power_gpio = -1;
 
        /*
         * Now rx51_peripherals_spi_board_info[1].irq is zero and

diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index b75a37a5831306f5408b7367946583e1bf4a496d..b661f896e9fe148ff322879c541c67c755a9a1a4 100644 (file)
--- a/drivers/net/wireless/ti/wl1251/sdio.c
+++ b/drivers/net/wireless/ti/wl1251/sdio.c
@@ -28,6 +28,7 @@
 #include <linux/wl12xx.h>
 #include <linux/irq.h>
 #include <linux/pm_runtime.h>
+#include <linux/gpio.h>
 
 #include "wl1251.h"
 
@@ -182,8 +183,9 @@ static int wl1251_sdio_set_power(struct wl1251 *wl, bool enable)
                 * callback in case it wants to do any additional setup,
                 * for example enabling clock buffer for the module.
                 */
-               if (wl->set_power)
-                       wl->set_power(true);
+               if (gpio_is_valid(wl->power_gpio))
+                       gpio_set_value(wl->power_gpio, true);
+
 
                ret = pm_runtime_get_sync(&func->dev);
                if (ret < 0) {
@@ -203,8 +205,8 @@ static int wl1251_sdio_set_power(struct wl1251 *wl, bool enable)
                if (ret < 0)
                        goto out;
 
-               if (wl->set_power)
-                       wl->set_power(false);
+               if (gpio_is_valid(wl->power_gpio))
+                       gpio_set_value(wl->power_gpio, false);
        }
 
 out:
@@ -256,11 +258,20 @@ static int wl1251_sdio_probe(struct sdio_func *func,
 
        wl1251_board_data = wl1251_get_platform_data();
        if (!IS_ERR(wl1251_board_data)) {
-               wl->set_power = wl1251_board_data->set_power;
+               wl->power_gpio = wl1251_board_data->power_gpio;
                wl->irq = wl1251_board_data->irq;
                wl->use_eeprom = wl1251_board_data->use_eeprom;
        }
 
+       if (gpio_is_valid(wl->power_gpio)) {
+               ret = devm_gpio_request(&func->dev, wl->power_gpio,
+                                                               "wl1251 power");
+               if (ret) {
+                       wl1251_error("Failed to request gpio: %d\n", ret);
+                       goto disable;
+               }
+       }
+
        if (wl->irq) {
                irq_set_status_flags(wl->irq, IRQ_NOAUTOEN);
                ret = request_irq(wl->irq, wl1251_line_irq, 0, "wl1251", wl);

diff --git a/drivers/net/wireless/ti/wl1251/spi.c b/drivers/net/wireless/ti/wl1251/spi.c
index 62403a14759202958f82035e11a60c32bbbefa6a..6abcbc3f7fc7d6c207c79b3f4fc5e0c0bc23d206 100644 (file)
--- a/drivers/net/wireless/ti/wl1251/spi.c
+++ b/drivers/net/wireless/ti/wl1251/spi.c
@@ -26,6 +26,7 @@
 #include <linux/crc7.h>
 #include <linux/spi/spi.h>
 #include <linux/wl12xx.h>
+#include <linux/gpio.h>
 
 #include "wl1251.h"
 #include "reg.h"
@@ -221,8 +222,8 @@ static void wl1251_spi_disable_irq(struct wl1251 *wl)
 
 static int wl1251_spi_set_power(struct wl1251 *wl, bool enable)
 {
-       if (wl->set_power)
-               wl->set_power(enable);
+       if (gpio_is_valid(wl->power_gpio))
+               gpio_set_value(wl->power_gpio, enable);
 
        return 0;
 }
@@ -271,22 +272,33 @@ static int wl1251_spi_probe(struct spi_device *spi)
                goto out_free;
        }
 
-       wl->set_power = pdata->set_power;
-       if (!wl->set_power) {
-               wl1251_error("set power function missing in platform data");
-               return -ENODEV;
+       wl->power_gpio = pdata->power_gpio;
+
+       if (gpio_is_valid(wl->power_gpio)) {
+               ret = devm_gpio_request_one(&spi->dev, wl->power_gpio,
+                                       GPIOF_OUT_INIT_LOW, "wl1251 power");
+               if (ret) {
+                       wl1251_error("Failed to request gpio: %d\n", ret);
+                       goto out_free;
+               }
+       } else {
+               wl1251_error("set power gpio missing in platform data");
+               ret = -ENODEV;
+               goto out_free;
        }
 
        wl->irq = spi->irq;
        if (wl->irq < 0) {
                wl1251_error("irq missing in platform data");
-               return -ENODEV;
+               ret = -ENODEV;
+               goto out_free;
        }
 
        wl->use_eeprom = pdata->use_eeprom;
 
        irq_set_status_flags(wl->irq, IRQ_NOAUTOEN);
-       ret = request_irq(wl->irq, wl1251_irq, 0, DRIVER_NAME, wl);
+       ret = devm_request_irq(&spi->dev, wl->irq, wl1251_irq, 0,
+                                                       DRIVER_NAME, wl);
        if (ret < 0) {
                wl1251_error("request_irq() failed: %d", ret);
                goto out_free;
@@ -296,13 +308,10 @@ static int wl1251_spi_probe(struct spi_device *spi)
 
        ret = wl1251_init_ieee80211(wl);
        if (ret)
-               goto out_irq;
+               goto out_free;
 
        return 0;
 
- out_irq:
-       free_irq(wl->irq, wl);
-
  out_free:
        ieee80211_free_hw(hw);
 

diff --git a/drivers/net/wireless/ti/wl1251/wl1251.h b/drivers/net/wireless/ti/wl1251/wl1251.h
index 235617a7716d59ff4a699427540c1ecb4a612178..389fe25af1b6240b8b21f7e17b794423c29df3eb 100644 (file)
--- a/drivers/net/wireless/ti/wl1251/wl1251.h
+++ b/drivers/net/wireless/ti/wl1251/wl1251.h
@@ -276,7 +276,7 @@ struct wl1251 {
        void *if_priv;
        const struct wl1251_if_operations *if_ops;
 
-       void (*set_power)(bool enable);
+       int power_gpio;
        int irq;
        bool use_eeprom;
 

diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h
index b516b4fa22def9a298eeb9371e2d565bb68890ff..a9c723be1acfca6cd6d6bbfa37f453404aadb83d 100644 (file)
--- a/include/linux/wl12xx.h
+++ b/include/linux/wl12xx.h
@@ -49,7 +49,7 @@ enum {
 };
 
 struct wl1251_platform_data {
-       void (*set_power)(bool enable);
+       int power_gpio;
        /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */
        int irq;
        bool use_eeprom;