korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-23 22:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

regulator: da9211: Pass descriptors instead of GPIO numbers

Browse Source 
This augments the DA9211 regulator driver to fetch its GPIO descriptors
directly from the device tree using the newly exported
devm_get_gpiod_from_child().

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Linus Walleij 2018-02-12 14:17:02 +01:00 committed by Mark Brown
parent 8d05560d1d
commit 11da04af0d
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/regulator/da9211-regulator.c
View File

@ -15,7 +15,6 @@
*/ */
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
@ -25,7 +24,7 @@
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/of_gpio.h> #include <linux/gpio/consumer.h>
#include <linux/regulator/of_regulator.h> #include <linux/regulator/of_regulator.h>
#include <linux/regulator/da9211.h> #include <linux/regulator/da9211.h>
#include "da9211-regulator.h" #include "da9211-regulator.h"
@ -294,9 +293,12 @@ static struct da9211_pdata *da9211_parse_regulators_dt(
pdata->init_data[n] = da9211_matches[i].init_data; pdata->init_data[n] = da9211_matches[i].init_data;
pdata->reg_node[n] = da9211_matches[i].of_node; pdata->reg_node[n] = da9211_matches[i].of_node;
pdata->gpio_ren[n] = pdata->gpiod_ren[n] = devm_gpiod_get_from_of_node(dev,
of_get_named_gpio(da9211_matches[i].of_node, da9211_matches[i].of_node,
"enable-gpios", 0); "enable",
0,
GPIOD_OUT_HIGH,
"da9211-enable");
n++; n++;
} }
@ -382,13 +384,10 @@ static int da9211_regulator_init(struct da9211 *chip)
config.regmap = chip->regmap; config.regmap = chip->regmap;
config.of_node = chip->pdata->reg_node[i]; config.of_node = chip->pdata->reg_node[i];
if (gpio_is_valid(chip->pdata->gpio_ren[i])) { if (chip->pdata->gpiod_ren[i])
config.ena_gpio = chip->pdata->gpio_ren[i]; config.ena_gpiod = chip->pdata->gpiod_ren[i];
config.ena_gpio_initialized = true; else
} else { config.ena_gpiod = NULL;
config.ena_gpio = -EINVAL;
config.ena_gpio_initialized = false;
}
chip->rdev[i] = devm_regulator_register(chip->dev, chip->rdev[i] = devm_regulator_register(chip->dev,
&da9211_regulators[i], &config); &da9211_regulators[i], &config);

4
include/linux/regulator/da9211.h
View File

@ -21,6 +21,8 @@
#define DA9211_MAX_REGULATORS 2 #define DA9211_MAX_REGULATORS 2
struct gpio_desc;
enum da9211_chip_id { enum da9211_chip_id {
DA9211, DA9211,
DA9212, DA9212,
@ -39,7 +41,7 @@ struct da9211_pdata {
* 2 : 2 phase 2 buck * 2 : 2 phase 2 buck
*/ */
int num_buck; int num_buck;
int gpio_ren[DA9211_MAX_REGULATORS]; struct gpio_desc *gpiod_ren[DA9211_MAX_REGULATORS];
struct device_node *reg_node[DA9211_MAX_REGULATORS]; struct device_node *reg_node[DA9211_MAX_REGULATORS];
struct regulator_init_data *init_data[DA9211_MAX_REGULATORS]; struct regulator_init_data *init_data[DA9211_MAX_REGULATORS];
}; };