2 files changed, 4 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt
index ecfc6ccd67ef..48a3b8e5d6bd 100644
--- a/Documentation/devicetree/bindings/regulator/regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/regulator.txt
@@ -9,6 +9,7 @@ Optional properties:
 - regulator-max-microamp: largest current consumers may set
 - regulator-always-on: boolean, regulator should never be disabled
 - regulator-boot-on: bootloader/firmware enabled regulator
+- regulator-allow-bypass: allow the regulator to go into bypass mode
 - <name>-supply: phandle to the parent supply/regulator node
 - regulator-ramp-delay: ramp delay for regulator(in uV/uS)
 
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);