renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 06:34:11 +08:00
Code

regulator: max77686: Pass descriptor instead of GPIO number

Browse Source 
Instead of passing a global GPIO number, pass a descriptor looked
up from the device tree configuration node.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Tested-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Linus Walleij 2018-05-14 10:06:26 +02:00 committed by Mark Brown
parent e1739e86f0
commit c89c00e2b8
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/regulator/max77686-regulator.c
View File

@ -25,8 +25,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio.h> #include <linux/gpio/consumer.h>
#include <linux/of_gpio.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/regulator/driver.h> #include <linux/regulator/driver.h>
@ -90,6 +89,7 @@ enum max77686_ramp_rate {
}; };
struct max77686_data { struct max77686_data {
struct device *dev;
DECLARE_BITMAP(gpio_enabled, MAX77686_REGULATORS); DECLARE_BITMAP(gpio_enabled, MAX77686_REGULATORS);
/* Array indexed by regulator id */ /* Array indexed by regulator id */
@ -269,16 +269,20 @@ static int max77686_of_parse_cb(struct device_node *np,
case MAX77686_BUCK8: case MAX77686_BUCK8:
case MAX77686_BUCK9: case MAX77686_BUCK9:
case MAX77686_LDO20 ... MAX77686_LDO22: case MAX77686_LDO20 ... MAX77686_LDO22:
config->ena_gpio = of_get_named_gpio(np, config->ena_gpiod = devm_gpiod_get_from_of_node(max77686->dev,
"maxim,ena-gpios", 0); np,
config->ena_gpio_flags = GPIOF_OUT_INIT_HIGH; "maxim,ena",
config->ena_gpio_initialized = true; 0,
GPIOD_OUT_HIGH,
"max77686-regulator");
if (IS_ERR(config->ena_gpiod))
config->ena_gpiod = NULL;
break; break;
default: default:
return 0; return 0;
} }
if (gpio_is_valid(config->ena_gpio)) { if (config->ena_gpiod) {
set_bit(desc->id, max77686->gpio_enabled); set_bit(desc->id, max77686->gpio_enabled);
return regmap_update_bits(config->regmap, desc->enable_reg, return regmap_update_bits(config->regmap, desc->enable_reg,
@ -521,6 +525,7 @@ static int max77686_pmic_probe(struct platform_device *pdev)
if (!max77686) if (!max77686)
return -ENOMEM; return -ENOMEM;
max77686->dev = &pdev->dev;
config.dev = iodev->dev; config.dev = iodev->dev;
config.regmap = iodev->regmap; config.regmap = iodev->regmap;
config.driver_data = max77686; config.driver_data = max77686;