2 files changed, 12 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/regulator/gpio-regulator.txt b/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
index 63c659800c03..3ecb585e786c 100644
--- a/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
@@ -8,6 +8,7 @@ Required properties:
 Optional properties:
 - enable-gpio           : GPIO to use to enable/disable the regulator.
 - gpios                 : GPIO group used to control voltage.
+- gpios-states          : gpios pin's initial states. 1 means HIGH
 - startup-delay-us      : Startup time in microseconds.
 - enable-active-high    : Polarity of GPIO is active high (default is low).
 
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index bad44f366b3f..ac3a8c732dd8 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -172,11 +172,22 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np)
         if (!config->gpios)
                 return ERR_PTR(-ENOMEM);
 
+        prop = of_find_property(np, "gpios-states", NULL);
+        if (prop) {
+                proplen = prop->length / sizeof(int);
+                if (proplen != config->nr_gpios) {
+                        /* gpios <-> gpios-states mismatch */
+                        prop = NULL;
+                }
+        }
+
         for (i = 0; i < config->nr_gpios; i++) {
                 gpio = of_get_named_gpio(np, "gpios", i);
                 if (gpio < 0)
                         break;
                 config->gpios[i].gpio = gpio;
+                if (prop && be32_to_cpup((int *)prop->value + i))
+                        config->gpios[i].flags = GPIOF_OUT_INIT_HIGH;
         }
 
         /* Fetch states. */