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

net: rfkill: gpio: clean up clock handling

Browse Source 
Use a simple flag to see the state of the clock, and make
the clock available even without a name. Also, get rid of
HAVE_CLK dependency.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: Rhyland Klein <rklein@nvidia.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Heikki Krogerus 2013-10-16 13:53:40 +03:00 committed by Johannes Berg
parent 5e7ca3937f
commit f02ae59b12
2 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/rfkill/Kconfig
View File

@ -36,7 +36,7 @@ config RFKILL_REGULATOR
config RFKILL_GPIO config RFKILL_GPIO
tristate "GPIO RFKILL driver" tristate "GPIO RFKILL driver"
depends on RFKILL && GPIOLIB && HAVE_CLK depends on RFKILL && GPIOLIB
default n default n
help help
If you say yes here you get support of a generic gpio RFKILL If you say yes here you get support of a generic gpio RFKILL

35
net/rfkill/rfkill-gpio.c
View File

@ -27,24 +27,13 @@
#include <linux/rfkill-gpio.h> #include <linux/rfkill-gpio.h>
enum rfkill_gpio_clk_state {
UNSPECIFIED = 0,
PWR_ENABLED,
PWR_DISABLED
};
#define PWR_CLK_SET(_RF, _EN) \
((_RF)->pwr_clk_enabled = (!(_EN) ? PWR_ENABLED : PWR_DISABLED))
#define PWR_CLK_ENABLED(_RF) ((_RF)->pwr_clk_enabled == PWR_ENABLED)
#define PWR_CLK_DISABLED(_RF) ((_RF)->pwr_clk_enabled != PWR_ENABLED)
struct rfkill_gpio_data { struct rfkill_gpio_data {
struct rfkill_gpio_platform_data *pdata; struct rfkill_gpio_platform_data *pdata;
struct rfkill *rfkill_dev; struct rfkill *rfkill_dev;
char *reset_name; char *reset_name;
char *shutdown_name; char *shutdown_name;
enum rfkill_gpio_clk_state pwr_clk_enabled; struct clk *clk;
struct clk *pwr_clk; bool clk_enabled;
}; };
static int rfkill_gpio_set_power(void *data, bool blocked) static int rfkill_gpio_set_power(void *data, bool blocked)
@ -56,19 +45,18 @@ static int rfkill_gpio_set_power(void *data, bool blocked)
gpio_direction_output(rfkill->pdata->shutdown_gpio, 0); gpio_direction_output(rfkill->pdata->shutdown_gpio, 0);
if (gpio_is_valid(rfkill->pdata->reset_gpio)) if (gpio_is_valid(rfkill->pdata->reset_gpio))
gpio_direction_output(rfkill->pdata->reset_gpio, 0); gpio_direction_output(rfkill->pdata->reset_gpio, 0);
if (rfkill->pwr_clk && PWR_CLK_ENABLED(rfkill)) if (!IS_ERR(rfkill->clk) && rfkill->clk_enabled)
clk_disable(rfkill->pwr_clk); clk_disable(rfkill->clk);
} else { } else {
if (rfkill->pwr_clk && PWR_CLK_DISABLED(rfkill)) if (!IS_ERR(rfkill->clk) && !rfkill->clk_enabled)
clk_enable(rfkill->pwr_clk); clk_enable(rfkill->clk);
if (gpio_is_valid(rfkill->pdata->reset_gpio)) if (gpio_is_valid(rfkill->pdata->reset_gpio))
gpio_direction_output(rfkill->pdata->reset_gpio, 1); gpio_direction_output(rfkill->pdata->reset_gpio, 1);
if (gpio_is_valid(rfkill->pdata->shutdown_gpio)) if (gpio_is_valid(rfkill->pdata->shutdown_gpio))
gpio_direction_output(rfkill->pdata->shutdown_gpio, 1); gpio_direction_output(rfkill->pdata->shutdown_gpio, 1);
} }
if (rfkill->pwr_clk) rfkill->clk_enabled = blocked;
PWR_CLK_SET(rfkill, blocked);
return 0; return 0;
} }
@ -123,14 +111,7 @@ static int rfkill_gpio_probe(struct platform_device *pdev)
snprintf(rfkill->reset_name, len + 6 , "%s_reset", pdata->name); snprintf(rfkill->reset_name, len + 6 , "%s_reset", pdata->name);
snprintf(rfkill->shutdown_name, len + 9, "%s_shutdown", pdata->name); snprintf(rfkill->shutdown_name, len + 9, "%s_shutdown", pdata->name);
if (pdata->power_clk_name) { rfkill->clk = devm_clk_get(&pdev->dev, pdata->power_clk_name);
rfkill->pwr_clk = devm_clk_get(&pdev->dev,
pdata->power_clk_name);
if (IS_ERR(rfkill->pwr_clk)) {
pr_warn("%s: can't find pwr_clk.\n", __func__);
return PTR_ERR(rfkill->pwr_clk);
}
}
if (gpio_is_valid(pdata->reset_gpio)) { if (gpio_is_valid(pdata->reset_gpio)) {
ret = devm_gpio_request(&pdev->dev, pdata->reset_gpio, ret = devm_gpio_request(&pdev->dev, pdata->reset_gpio,