git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'riscv/for-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv...
[sfrench/cifs-2.6.git]
/
drivers
/
regulator
/
max77686-regulator.c
diff --git
a/drivers/regulator/max77686-regulator.c
b/drivers/regulator/max77686-regulator.c
index 8020eb57374a1b32d3a1c322483c5a0bb308c514..c8e579e993160d9ac8424ee1f63a11461d3e1732 100644
(file)
--- 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");