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

Merge branch 'regulator-4.18' into regulator-linus

Browse Source
This commit is contained in:
Mark Brown 2018-08-10 17:31:22 +01:00
commit a8afa92ec0
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/regulator/arizona-ldo1.c
View File

@ -36,6 +36,8 @@ struct arizona_ldo1 {
struct regulator_consumer_supply supply; struct regulator_consumer_supply supply;
struct regulator_init_data init_data; struct regulator_init_data init_data;
struct gpio_desc *ena_gpiod;
}; };
static int arizona_ldo1_hc_list_voltage(struct regulator_dev *rdev, static int arizona_ldo1_hc_list_voltage(struct regulator_dev *rdev,
@ -253,12 +255,17 @@ static int arizona_ldo1_common_init(struct platform_device *pdev,
} }
} }
/* We assume that high output = regulator off */ /* We assume that high output = regulator off
config.ena_gpiod = devm_gpiod_get_optional(&pdev->dev, "wlf,ldoena", * Don't use devm, since we need to get against the parent device
GPIOD_OUT_HIGH); * so clean up would happen at the wrong time
*/
config.ena_gpiod = gpiod_get_optional(parent_dev, "wlf,ldoena",
GPIOD_OUT_LOW);
if (IS_ERR(config.ena_gpiod)) if (IS_ERR(config.ena_gpiod))
return PTR_ERR(config.ena_gpiod); return PTR_ERR(config.ena_gpiod);
ldo1->ena_gpiod = config.ena_gpiod;
if (pdata->init_data) if (pdata->init_data)
config.init_data = pdata->init_data; config.init_data = pdata->init_data;
else else
@ -276,6 +283,9 @@ static int arizona_ldo1_common_init(struct platform_device *pdev,
of_node_put(config.of_node); of_node_put(config.of_node);
if (IS_ERR(ldo1->regulator)) { if (IS_ERR(ldo1->regulator)) {
if (config.ena_gpiod)
gpiod_put(config.ena_gpiod);
ret = PTR_ERR(ldo1->regulator); ret = PTR_ERR(ldo1->regulator);
dev_err(&pdev->dev, "Failed to register LDO1 supply: %d\n", dev_err(&pdev->dev, "Failed to register LDO1 supply: %d\n",
ret); ret);
@ -334,8 +344,19 @@ static int arizona_ldo1_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int arizona_ldo1_remove(struct platform_device *pdev)
{
struct arizona_ldo1 *ldo1 = platform_get_drvdata(pdev);
if (ldo1->ena_gpiod)
gpiod_put(ldo1->ena_gpiod);
return 0;
}
static struct platform_driver arizona_ldo1_driver = { static struct platform_driver arizona_ldo1_driver = {
.probe = arizona_ldo1_probe, .probe = arizona_ldo1_probe,
.remove = arizona_ldo1_remove,
.driver = { .driver = {
.name = "arizona-ldo1", .name = "arizona-ldo1",
}, },