iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wl1251: spi: add vio regulator support

Browse Source 
This patch adds support for requesting the regulator powering
the vio pin.

Signed-off-by: Sebastian Reichel <sre@debian.org>
Reviewed-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sebastian Reichel
2014-02-15 00:05:54 +01:00
committed by John W. Linville
parent 1d207cd30b
commit e4c2e09e15
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/wireless/ti/wl1251/spi.c
View File

@ -27,6 +27,7 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/wl12xx.h> #include <linux/wl12xx.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/regulator/consumer.h>
#include "wl1251.h" #include "wl1251.h"
#include "reg.h" #include "reg.h"
@ -306,13 +307,26 @@ static int wl1251_spi_probe(struct spi_device *spi)
irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING); irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
ret = wl1251_init_ieee80211(wl); wl->vio = devm_regulator_get(&spi->dev, "vio");
if (IS_ERR(wl->vio)) {
ret = PTR_ERR(wl->vio);
wl1251_error("vio regulator missing: %d", ret);
goto out_free;
}
ret = regulator_enable(wl->vio);
if (ret) if (ret)
goto out_free; goto out_free;
ret = wl1251_init_ieee80211(wl);
if (ret)
goto disable_regulator;
return 0; return 0;
out_free: disable_regulator:
regulator_disable(wl->vio);
out_free:
ieee80211_free_hw(hw); ieee80211_free_hw(hw);
return ret; return ret;
@ -324,6 +338,7 @@ static int wl1251_spi_remove(struct spi_device *spi)
free_irq(wl->irq, wl); free_irq(wl->irq, wl);
wl1251_free_hw(wl); wl1251_free_hw(wl);
regulator_disable(wl->vio);
return 0; return 0;
} }

2
drivers/net/wireless/ti/wl1251/wl1251.h
View File

@ -280,6 +280,8 @@ struct wl1251 {
int irq; int irq;
bool use_eeprom; bool use_eeprom;
struct regulator *vio;
spinlock_t wl_lock; spinlock_t wl_lock;
enum wl1251_state state; enum wl1251_state state;