Merge remote-tracking branches 'regulator/topic/doc', 'regulator/topic/enable', ...

[linux-2.6-block.git] / Documentation / devicetree / bindings / regulator / gpio-regulator.txt

diff --git a/Documentation/devicetree/bindings/regulator/gpio-regulator.txt b/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
index 63c659800c0320a9b08a8878fcb3ab327f270d9f..e5cac1e0ca8a734d43549ad125a837beef457e13 100644 (file)
--- a/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
@@ -8,8 +8,12 @@ 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 array. 0: LOW, 1: HIGH.
+                         defualt is LOW if nothing is specified.
 - startup-delay-us     : Startup time in microseconds.
 - enable-active-high   : Polarity of GPIO is active high (default is low).
+- regulator-type       : Specifies what is being regulated, must be either
+                         "voltage" or "current", defaults to current.
 
 Any property defined as part of the core regulator binding defined in
 regulator.txt can also be used.