5 files changed, 16 insertions, 10 deletions

diff --git a/Documentation/devicetree/bindings/regulator/max8997-regulator.txt b/Documentation/devicetree/bindings/regulator/max8997-regulator.txt
index 9e5e51d78868..5c186a7a77ba 100644
--- a/Documentation/devicetree/bindings/regulator/max8997-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/max8997-regulator.txt
@@ -1,6 +1,6 @@
 * Maxim MAX8997 Voltage and Current Regulator
 
-The Maxim MAX8997 is a multi-function device which includes volatage and
+The Maxim MAX8997 is a multi-function device which includes voltage and
 current regulators, rtc, charger controller and other sub-blocks. It is
 interfaced to the host controller using a i2c interface. Each sub-block is
 addressed by the host system using different i2c slave address. This document
diff --git a/Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt b/Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
index a35ff99003a5..d1660a90fc06 100644
--- a/Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
@@ -1,6 +1,6 @@
 * Samsung S5M8767 Voltage and Current Regulator
 
-The Samsung S5M8767 is a multi-function device which includes volatage and
+The Samsung S5M8767 is a multi-function device which includes voltage and
 current regulators, rtc, charger controller and other sub-blocks. It is
 interfaced to the host controller using a i2c interface. Each sub-block is
 addressed by the host system using different i2c slave address. This document
@@ -103,13 +103,13 @@ Example:
 
                 s5m8767,pmic-buck-default-dvs-idx = <0>;
 
-                s5m8767,pmic-buck-dvs-gpios = <&gpx0 0 1 0 0>, /* DVS1 */
-                                                 <&gpx0 1 1 0 0>, /* DVS2 */
-                                                 <&gpx0 2 1 0 0>; /* DVS3 */
+                s5m8767,pmic-buck-dvs-gpios = <&gpx0 0 0>, /* DVS1 */
+                                                 <&gpx0 1 0>, /* DVS2 */
+                                                 <&gpx0 2 0>; /* DVS3 */
 
-                s5m8767,pmic-buck-ds-gpios = <&gpx2 3 1 0 0>, /* SET1 */
-                                                <&gpx2 4 1 0 0>, /* SET2 */
-                                                <&gpx2 5 1 0 0>; /* SET3 */
+                s5m8767,pmic-buck-ds-gpios = <&gpx2 3 0>, /* SET1 */
+                                                <&gpx2 4 0>, /* SET2 */
+                                                <&gpx2 5 0>; /* SET3 */
 
                 s5m8767,pmic-buck2-dvs-voltage = <1350000>, <1300000>,
                                                  <1250000>, <1200000>,
diff --git a/MAINTAINERS b/MAINTAINERS
index d7e0cfb17745..293c762f23d1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8976,7 +8976,7 @@ M:	Liam Girdwood <lgirdwood@gmail.com>
 M:      Mark Brown <broonie@kernel.org>
 W:      http://opensource.wolfsonmicro.com/node/15
 W:      http://www.slimlogic.co.uk/?p=48
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/regulator.git
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
 S:      Supported
 F:      drivers/regulator/
 F:      include/linux/regulator/
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index c9f16e17920f..2f62564ca936 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -42,7 +42,7 @@ static int get_ramp_delay(int ramp_delay)
 {
         unsigned char cnt = 0;
 
-        ramp_delay /= 6;
+        ramp_delay /= 6250;
 
         while (true) {
                 ramp_delay = ramp_delay >> 1;
@@ -113,6 +113,7 @@ static struct regulator_ops s2mps11_buck_ops = {
         .min_uV         = S2MPS11_BUCK_MIN1,                    \
         .uV_step        = S2MPS11_BUCK_STEP1,                   \
         .n_voltages     = S2MPS11_BUCK_N_VOLTAGES,              \
+        .ramp_delay     = S2MPS11_RAMP_DELAY,                   \
         .vsel_reg       = S2MPS11_REG_B1CTRL2 + (num - 1) * 2,  \
         .vsel_mask      = S2MPS11_BUCK_VSEL_MASK,               \
         .enable_reg     = S2MPS11_REG_B1CTRL1 + (num - 1) * 2,  \
@@ -128,6 +129,7 @@ static struct regulator_ops s2mps11_buck_ops = {
         .min_uV         = S2MPS11_BUCK_MIN1,                    \
         .uV_step        = S2MPS11_BUCK_STEP1,                   \
         .n_voltages     = S2MPS11_BUCK_N_VOLTAGES,              \
+        .ramp_delay     = S2MPS11_RAMP_DELAY,                   \
         .vsel_reg       = S2MPS11_REG_B5CTRL2,                  \
         .vsel_mask      = S2MPS11_BUCK_VSEL_MASK,               \
         .enable_reg     = S2MPS11_REG_B5CTRL1,                  \
@@ -143,6 +145,7 @@ static struct regulator_ops s2mps11_buck_ops = {
         .min_uV         = S2MPS11_BUCK_MIN1,                    \
         .uV_step        = S2MPS11_BUCK_STEP1,                   \
         .n_voltages     = S2MPS11_BUCK_N_VOLTAGES,              \
+        .ramp_delay     = S2MPS11_RAMP_DELAY,                   \
         .vsel_reg       = S2MPS11_REG_B6CTRL2 + (num - 6) * 2,  \
         .vsel_mask      = S2MPS11_BUCK_VSEL_MASK,               \
         .enable_reg     = S2MPS11_REG_B6CTRL1 + (num - 6) * 2,  \
@@ -158,6 +161,7 @@ static struct regulator_ops s2mps11_buck_ops = {
         .min_uV         = S2MPS11_BUCK_MIN3,                    \
         .uV_step        = S2MPS11_BUCK_STEP3,                   \
         .n_voltages     = S2MPS11_BUCK_N_VOLTAGES,              \
+        .ramp_delay     = S2MPS11_RAMP_DELAY,                   \
         .vsel_reg       = S2MPS11_REG_B9CTRL2,                  \
         .vsel_mask      = S2MPS11_BUCK_VSEL_MASK,               \
         .enable_reg     = S2MPS11_REG_B9CTRL1,                  \
@@ -173,6 +177,7 @@ static struct regulator_ops s2mps11_buck_ops = {
         .min_uV         = S2MPS11_BUCK_MIN2,                    \
         .uV_step        = S2MPS11_BUCK_STEP2,                   \
         .n_voltages     = S2MPS11_BUCK_N_VOLTAGES,              \
+        .ramp_delay     = S2MPS11_RAMP_DELAY,                   \
         .vsel_reg       = S2MPS11_REG_B10CTRL2,                 \
         .vsel_mask      = S2MPS11_BUCK_VSEL_MASK,               \
         .enable_reg     = S2MPS11_REG_B10CTRL1,                 \
diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
index ad2252f239d7..4e94dc65f987 100644
--- a/include/linux/mfd/samsung/s2mps11.h
+++ b/include/linux/mfd/samsung/s2mps11.h
@@ -189,6 +189,7 @@ enum s2mps11_regulators {
 #define S2MPS11_ENABLE_SHIFT    0x06
 #define S2MPS11_LDO_N_VOLTAGES  (S2MPS11_LDO_VSEL_MASK + 1)
 #define S2MPS11_BUCK_N_VOLTAGES (S2MPS11_BUCK_VSEL_MASK + 1)
+#define S2MPS11_RAMP_DELAY      25000           /* uV/us */
 
 #define S2MPS11_PMIC_EN_SHIFT   6
 #define S2MPS11_REGULATOR_MAX (S2MPS11_REG_MAX - 3)