diff options
| author | Mark Brown <broonie@kernel.org> | 2018-11-19 13:16:15 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-11-19 13:16:15 +0000 |
| commit | ffb8c1e45e7ae648a3a1689aa71be50fb459316e (patch) | |
| tree | 9861dadf0dc742e519e28eabdeee448a57c86170 /drivers/regulator/of_regulator.c | |
| parent | a8d8ee437ea0bf21f840f33ca87f8e1641727aae (diff) | |
| parent | ff9b34b615a37a3f4d359bf82fc97f5e0310b301 (diff) | |
Merge branch 'topic/coupled' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-4.21 for trivial conflict
Diffstat (limited to 'drivers/regulator/of_regulator.c')
| -rw-r--r-- | drivers/regulator/of_regulator.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index 82fb1228ca2c..c711a0a2bc4b 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c @@ -171,6 +171,10 @@ static void of_get_regulation_constraints(struct device_node *np, &pval)) constraints->max_spread = pval; + if (!of_property_read_u32(np, "regulator-max-step-microvolt", + &pval)) + constraints->max_uV_step = pval; + constraints->over_current_protection = of_property_read_bool(np, "regulator-over-current-protection"); |