Merge remote-tracking branch 'regulator/topic/core' into regulator-next

diff --combined Documentation/devicetree/bindings/regulator/regulator.txt
index 3cbf56c,e459226..2babe15
--- 1/Documentation/devicetree/bindings/regulator/regulator.txt
--- 2/Documentation/devicetree/bindings/regulator/regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/regulator.txt
@@@ -42,8 -42,16 +42,16 @@@ Optional properties
  - regulator-state-[mem/disk] node has following common properties:
        - regulator-on-in-suspend: regulator should be on in suspend state.
        - regulator-off-in-suspend: regulator should be off in suspend state.
-       - regulator-suspend-microvolt: regulator should be set to this voltage
-         in suspend.
+       - regulator-suspend-min-microvolt: minimum voltage may be set in
+         suspend state.
+       - regulator-suspend-max-microvolt: maximum voltage may be set in
+         suspend state.
+       - regulator-suspend-microvolt: the default voltage which regulator
+         would be set in suspend. This property is now deprecated, instead
+         setting voltage for suspend mode via the API which regulator
+         driver provides is recommended.
+       - regulator-changeable-in-suspend: whether the default voltage and
+         the regulator on/off in suspend can be changed in runtime.
        - regulator-mode: operating mode in the given suspend state.
          The set of possible operating modes depends on the capabilities of
          every hardware so the valid modes are documented on each regulator
@@@ -107,7 -115,7 +115,7 @@@ regulators (twl_reg1 and twl_reg2)
                ...
        };
  
 -      mmc: mmc@0x0 {
 +      mmc: mmc@0 {
                ...
                ...
                vmmc-supply = <&twl_reg1>;