1 files changed, 21 insertions, 10 deletions

diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
index e2b3d9c541e8..b661f896e9fe 100644
--- 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:
@@ -227,7 +229,7 @@ static int wl1251_sdio_probe(struct sdio_func *func,
         struct wl1251 *wl;
         struct ieee80211_hw *hw;
         struct wl1251_sdio *wl_sdio;
-        const struct wl12xx_platform_data *wl12xx_board_data;
+        const struct wl1251_platform_data *wl1251_board_data;
 
         hw = wl1251_alloc_hw();
         if (IS_ERR(hw))
@@ -254,11 +256,20 @@ static int wl1251_sdio_probe(struct sdio_func *func,
         wl->if_priv = wl_sdio;
         wl->if_ops = &wl1251_sdio_ops;
 
-        wl12xx_board_data = wl12xx_get_platform_data();
-        if (!IS_ERR(wl12xx_board_data)) {
-                wl->set_power = wl12xx_board_data->set_power;
-                wl->irq = wl12xx_board_data->irq;
-                wl->use_eeprom = wl12xx_board_data->use_eeprom;
+        wl1251_board_data = wl1251_get_platform_data();
+        if (!IS_ERR(wl1251_board_data)) {
+                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) {