Merge branch 'v4.4/topic/mm-kaslr' into linux-linaro-lsk-v4.4

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / of_regulator.c

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 250700c853bfa524991f6721256fb02876f54799..499e437c7e919f2576c694ef6b6466898d006dbf 100644 (file)
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -76,6 +76,9 @@ static void of_get_regulation_constraints(struct device_node *np,
        if (of_property_read_bool(np, "regulator-allow-bypass"))
                constraints->valid_ops_mask |= REGULATOR_CHANGE_BYPASS;
 
+       if (of_property_read_bool(np, "regulator-allow-set-load"))
+               constraints->valid_ops_mask |= REGULATOR_CHANGE_DRMS;
+
        ret = of_property_read_u32(np, "regulator-ramp-delay", &pval);
        if (!ret) {
                if (pval)