FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-13 04:41:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

regulator: core: convert to use gpio_desc internally

Browse Source 
Convert the regulator GPIO handling to use a gpio descriptor rather than
numbers.  This allows us to revise the interfaces to permit all GPIOs
to be used with the regulator core.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Russell King 2014-06-29 17:55:54 +01:00 committed by Mark Brown
parent 7171511eae
commit 778b28b434
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/regulator/core.c
View File

@ -24,6 +24,7 @@
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/gpio/consumer.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/regulator/of_regulator.h> #include <linux/regulator/of_regulator.h>
@ -77,7 +78,7 @@ struct regulator_map {
*/ */
struct regulator_enable_gpio { struct regulator_enable_gpio {
struct list_head list; struct list_head list;
int gpio; struct gpio_desc *gpiod;
u32 enable_count; /* a number of enabled shared GPIO */ u32 enable_count; /* a number of enabled shared GPIO */
u32 request_count; /* a number of requested shared GPIO */ u32 request_count; /* a number of requested shared GPIO */
unsigned int ena_gpio_invert:1; unsigned int ena_gpio_invert:1;
@ -1660,10 +1661,13 @@ static int regulator_ena_gpio_request(struct regulator_dev *rdev,
const struct regulator_config *config) const struct regulator_config *config)
{ {
struct regulator_enable_gpio *pin; struct regulator_enable_gpio *pin;
struct gpio_desc *gpiod;
int ret; int ret;
gpiod = gpio_to_desc(config->ena_gpio);
list_for_each_entry(pin, &regulator_ena_gpio_list, list) { list_for_each_entry(pin, &regulator_ena_gpio_list, list) {
if (pin->gpio == config->ena_gpio) { if (pin->gpiod == gpiod) {
rdev_dbg(rdev, "GPIO %d is already used\n", rdev_dbg(rdev, "GPIO %d is already used\n",
config->ena_gpio); config->ena_gpio);
goto update_ena_gpio_to_rdev; goto update_ena_gpio_to_rdev;
@ -1682,7 +1686,7 @@ static int regulator_ena_gpio_request(struct regulator_dev *rdev,
return -ENOMEM; return -ENOMEM;
} }
pin->gpio = config->ena_gpio; pin->gpiod = gpiod;
pin->ena_gpio_invert = config->ena_gpio_invert; pin->ena_gpio_invert = config->ena_gpio_invert;
list_add(&pin->list, &regulator_ena_gpio_list); list_add(&pin->list, &regulator_ena_gpio_list);
@ -1701,10 +1705,10 @@ static void regulator_ena_gpio_free(struct regulator_dev *rdev)
/* Free the GPIO only in case of no use */ /* Free the GPIO only in case of no use */
list_for_each_entry_safe(pin, n, &regulator_ena_gpio_list, list) { list_for_each_entry_safe(pin, n, &regulator_ena_gpio_list, list) {
if (pin->gpio == rdev->ena_pin->gpio) { if (pin->gpiod == rdev->ena_pin->gpiod) {
if (pin->request_count <= 1) { if (pin->request_count <= 1) {
pin->request_count = 0; pin->request_count = 0;
gpio_free(pin->gpio); gpiod_put(pin->gpiod);
list_del(&pin->list); list_del(&pin->list);
kfree(pin); kfree(pin);
} else { } else {
@ -1732,7 +1736,7 @@ static int regulator_ena_gpio_ctrl(struct regulator_dev *rdev, bool enable)
if (enable) { if (enable) {
/* Enable GPIO at initial use */ /* Enable GPIO at initial use */
if (pin->enable_count == 0) if (pin->enable_count == 0)
gpio_set_value_cansleep(pin->gpio, gpiod_set_value_cansleep(pin->gpiod,
!pin->ena_gpio_invert); !pin->ena_gpio_invert);
pin->enable_count++; pin->enable_count++;
@ -1744,7 +1748,7 @@ static int regulator_ena_gpio_ctrl(struct regulator_dev *rdev, bool enable)
/* Disable GPIO if not used */ /* Disable GPIO if not used */
if (pin->enable_count <= 1) { if (pin->enable_count <= 1) {
gpio_set_value_cansleep(pin->gpio, gpiod_set_value_cansleep(pin->gpiod,
pin->ena_gpio_invert); pin->ena_gpio_invert);
pin->enable_count = 0; pin->enable_count = 0;
} }