diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-09-10 19:00:50 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-11 12:16:51 +0200 |
| commit | 2418f749641caa59d5bc01b66ba16ec5414b28dc (patch) | |
| tree | 14881429041599b5d8d3cb9bbb4e0c0758f2e818 /drivers/regulator | |
| parent | regulator: uniphier: Add Pro5 USB3 VBUS support (diff) | |
| download | linux-2418f749641caa59d5bc01b66ba16ec5414b28dc.tar.xz linux-2418f749641caa59d5bc01b66ba16ec5414b28dc.zip | |
regulator: max77686: fix obtaining "maxim,ena" GPIO
This fixes 96392c3d8ca4, as devm_gpiod_get_from_of_node() does
not do translation "con-id" -> "con-id-gpios" that our bindings expects,
and therefore it was wrong to change connection ID to be simply
"maxim,ena" when moving to using devm_gpiod_get_from_of_node().
Fixes: 96392c3d8ca4 ("regulator: max77686: Pass descriptor instead of GPIO number")
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Link: https://lore.kernel.org/r/20190910170050.GA55530@dtor-ws
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/max77686-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max77686-regulator.c b/drivers/regulator/max77686-regulator.c index 8020eb57374a..c8e579e99316 100644 --- a/drivers/regulator/max77686-regulator.c +++ b/drivers/regulator/max77686-regulator.c @@ -257,7 +257,7 @@ static int max77686_of_parse_cb(struct device_node *np, case MAX77686_BUCK9: case MAX77686_LDO20 ... MAX77686_LDO22: config->ena_gpiod = gpiod_get_from_of_node(np, - "maxim,ena", + "maxim,ena-gpios", 0, GPIOD_OUT_HIGH | GPIOD_FLAGS_BIT_NONEXCLUSIVE, "max77686-regulator"); |