22 files changed, 1051 insertions, 694 deletions

diff --git a/Documentation/devicetree/bindings/mfd/lp873x.txt b/Documentation/devicetree/bindings/mfd/lp873x.txt
index 52766c2035f7..ae9cf39bd101 100644
--- a/Documentation/devicetree/bindings/mfd/lp873x.txt
+++ b/Documentation/devicetree/bindings/mfd/lp873x.txt
@@ -7,6 +7,9 @@ Required properties:
   - #gpio-cells:        Should be two.  The first cell is the pin number and
                         the second cell is used to specify flags.
                         See ../gpio/gpio.txt for more information.
+  - xxx-in-supply:      Phandle to parent supply node of each regulator
+                        populated under regulators node. xxx can be
+                        buck0, buck1, ldo0 or ldo1.
   - regulators: List of child nodes that specify the regulator
                         initialization data.
 Example:
@@ -17,6 +20,11 @@ pmic: lp8733@60 {
         gpio-controller;
         #gpio-cells = <2>;
 
+        buck0-in-supply = <&vsys_3v3>;
+        buck1-in-supply = <&vsys_3v3>;
+        ldo0-in-supply = <&vsys_3v3>;
+        ldo1-in-supply = <&vsys_3v3>;
+
         regulators {
                 lp8733_buck0: buck0 {
                         regulator-name = "lp8733-buck0";
diff --git a/Documentation/devicetree/bindings/mfd/max77620.txt b/Documentation/devicetree/bindings/mfd/max77620.txt
index 2ad44f7e4880..9c16d51cc15b 100644
--- a/Documentation/devicetree/bindings/mfd/max77620.txt
+++ b/Documentation/devicetree/bindings/mfd/max77620.txt
@@ -106,6 +106,18 @@ Here supported time periods by device in microseconds are as follows:
 MAX77620 supports 40, 80, 160, 320, 640, 1280, 2560 and 5120 microseconds.
 MAX20024 supports 20, 40, 80, 160, 320, 640, 1280 and 2540 microseconds.
 
+-maxim,power-ok-control: configure map power ok bit
+                        1: Enables POK(Power OK) to control nRST_IO and GPIO1
+                        POK function.
+                        0: Disables POK control.
+                        if property missing, do not configure MPOK bit.
+                        If POK mapping is enabled for GPIO1/nRST_IO then,
+                        GPIO1/nRST_IO pins are HIGH only if all rails
+                        that have POK control enabled are HIGH.
+                        If any of the rails goes down(which are enabled for POK
+                        control) then, GPIO1/nRST_IO goes LOW.
+                        this property is valid for max20024 only.
+
 For DT binding details of different sub modules like GPIO, pincontrol,
 regulator, power, please refer respective device-tree binding document
 under their respective sub-system directories.
diff --git a/Documentation/devicetree/bindings/mfd/tps65086.txt b/Documentation/devicetree/bindings/mfd/tps65086.txt
index d3705612a846..9cfa886fe99f 100644
--- a/Documentation/devicetree/bindings/mfd/tps65086.txt
+++ b/Documentation/devicetree/bindings/mfd/tps65086.txt
@@ -23,7 +23,7 @@ Required properties:
                             defined below.
 
 Optional regulator properties:
- - ti,regulator-step-size-25mv  : This is applicable for buck[1,2,6], set this
+ - ti,regulator-step-size-25mv  : This is applicable for buck[1-6], set this
                                     if the regulator is factory set with a 25mv
                                     step voltage mapping.
  - ti,regulator-decay           : This is applicable for buck[1-6], set this if
diff --git a/Documentation/devicetree/bindings/regulator/pwm-regulator.txt b/Documentation/devicetree/bindings/regulator/pwm-regulator.txt
index 3aeba9f86ed8..bf85aa9ad6a7 100644
--- a/Documentation/devicetree/bindings/regulator/pwm-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/pwm-regulator.txt
@@ -59,7 +59,7 @@ Any property defined as part of the core regulator binding can also be used.
 
 Continuous Voltage With Enable GPIO Example:
         pwm_regulator {
-                compatible = "pwm-regulator;
+                compatible = "pwm-regulator";
                 pwms = <&pwm1 0 8448 0>;
                 enable-gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
                 regulator-min-microvolt = <1016000>;
@@ -76,7 +76,7 @@ Continuous Voltage With Enable GPIO Example:
 
 Voltage Table Example:
         pwm_regulator {
-                compatible = "pwm-regulator;
+                compatible = "pwm-regulator";
                 pwms = <&pwm1 0 8448 0>;
                 regulator-min-microvolt = <1016000>;
                 regulator-max-microvolt = <1114000>;
diff --git a/MAINTAINERS b/MAINTAINERS
index c77e3bff262f..d04335080cdd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8761,6 +8761,7 @@ F:	drivers/regulator/tps65217-regulator.c
 F:      drivers/regulator/tps65218-regulator.c
 F:      drivers/regulator/tps65910-regulator.c
 F:      drivers/regulator/twl-regulator.c
+F:      drivers/regulator/twl6030-regulator.c
 F:      include/linux/i2c-omap.h
 
 OMAP DEVICE TREE SUPPORT
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 2142a5d3fc08..14294692beb9 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -104,7 +104,7 @@ obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o
 obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o
 obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o
 obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o
-obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
+obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o twl6030-regulator.o
 obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress-regulator.o
 obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
 obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c
index f7c88ff90c43..302b57cb89c6 100644
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -130,6 +130,7 @@ static const struct regulator_desc arizona_ldo1_hc = {
         .uV_step = 50000,
         .n_voltages = 8,
         .enable_time = 1500,
+        .ramp_delay = 24000,
 
         .owner = THIS_MODULE,
 };
@@ -153,6 +154,7 @@ static const struct regulator_desc arizona_ldo1 = {
         .uV_step = 25000,
         .n_voltages = 13,
         .enable_time = 500,
+        .ramp_delay = 24000,
 
         .owner = THIS_MODULE,
 };
diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
index 54382ef902c6..e6a512ebeae2 100644
--- a/drivers/regulator/axp20x-regulator.c
+++ b/drivers/regulator/axp20x-regulator.c
@@ -337,10 +337,18 @@ static const struct regulator_desc axp809_regulators[] = {
                  AXP22X_ELDO2_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(1)),
         AXP_DESC(AXP809, ELDO3, "eldo3", "eldoin", 700, 3300, 100,
                  AXP22X_ELDO3_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(2)),
-        AXP_DESC_IO(AXP809, LDO_IO0, "ldo_io0", "ips", 700, 3300, 100,
+        /*
+         * Note the datasheet only guarantees reliable operation up to
+         * 3.3V, this needs to be enforced via dts provided constraints
+         */
+        AXP_DESC_IO(AXP809, LDO_IO0, "ldo_io0", "ips", 700, 3800, 100,
                     AXP22X_LDO_IO0_V_OUT, 0x1f, AXP20X_GPIO0_CTRL, 0x07,
                     AXP22X_IO_ENABLED, AXP22X_IO_DISABLED),
-        AXP_DESC_IO(AXP809, LDO_IO1, "ldo_io1", "ips", 700, 3300, 100,
+        /*
+         * Note the datasheet only guarantees reliable operation up to
+         * 3.3V, this needs to be enforced via dts provided constraints