Merge remote-tracking branch 'regulator/for-next'

[karo-tx-linux.git] / Documentation / devicetree / bindings / regulator / tps6586x.txt

diff --git a/Documentation/devicetree/bindings/regulator/tps6586x.txt b/Documentation/devicetree/bindings/regulator/tps6586x.txt
index a2436e1edfc1ea39a76e87becbc65644f106f004..9b05e24b63d0ed724ce2ecc42963f10f754e9bd0 100644 (file)
--- a/Documentation/devicetree/bindings/regulator/tps6586x.txt
+++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt
@@ -19,6 +19,10 @@ Required properties:
 - vinldo678-supply: The input supply for the LDO6, LDO7 and LDO8
 - vinldo9-supply: The input supply for the LDO9
 
+Optional properties:
+- ti,system-power-controller: Telling whether or not this pmic is controlling
+  the system power.
+
 Each regulator is defined using the standard binding for regulators.
 
 Note: LDO5 and LDO_RTC is supplied by SYS regulator internally and driver
@@ -34,6 +38,8 @@ Example:
                #gpio-cells = <2>;
                gpio-controller;
 
+               ti,system-power-controller;
+
                sys-supply = <&some_reg>;
                vin-sm0-supply = <&some_reg>;
                vin-sm1-supply = <&some_reg>;