diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-01 11:17:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-01 11:17:10 +0100 |
| commit | 60908305fb47058bfd1d621bd65ee4dd90f5f2a9 (patch) | |
| tree | 060c8b21c3db6be0ff2bd71acc4187e1753c339c /drivers/regulator | |
| parent | 5ee6c728808d86b7c4bed316fd0a70114f4d7793 (diff) | |
| parent | 93134c7b40580ae8bb061d278a3ecffd7bbfccd6 (diff) | |
| download | linux-next-60908305fb47058bfd1d621bd65ee4dd90f5f2a9.tar.gz | |
Merge remote-tracking branch 'regulator/topic/of' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/of_regulator.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index 66ca769287ab..f3c8f8f9dc39 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c @@ -61,6 +61,9 @@ static void of_get_regulation_constraints(struct device_node *np, else /* status change should be possible if not always on. */ constraints->valid_ops_mask |= REGULATOR_CHANGE_STATUS; + if (of_property_read_bool(np, "regulator-allow-bypass")) + constraints->valid_ops_mask |= REGULATOR_CHANGE_BYPASS; + ramp_delay = of_get_property(np, "regulator-ramp-delay", NULL); if (ramp_delay) constraints->ramp_delay = be32_to_cpu(*ramp_delay); |