2 files changed, 24 insertions, 6 deletions

diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index d24e2c783dc5..6dfa3502e1f1 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -308,7 +308,7 @@ static struct regulator_ops s2mps11_buck_ops = {
         .enable_mask    = S2MPS11_ENABLE_MASK                   \
 }
 
-#define regulator_desc_s2mps11_buck6_10(num, min, step) {       \
+#define regulator_desc_s2mps11_buck67810(num, min, step) {      \
         .name           = "BUCK"#num,                           \
         .id             = S2MPS11_BUCK##num,                    \
         .ops            = &s2mps11_buck_ops,                    \
@@ -324,6 +324,22 @@ static struct regulator_ops s2mps11_buck_ops = {
         .enable_mask    = S2MPS11_ENABLE_MASK                   \
 }
 
+#define regulator_desc_s2mps11_buck9 {                          \
+        .name           = "BUCK9",                              \
+        .id             = S2MPS11_BUCK9,                        \
+        .ops            = &s2mps11_buck_ops,                    \
+        .type           = REGULATOR_VOLTAGE,                    \
+        .owner          = THIS_MODULE,                          \
+        .min_uV         = MIN_3000_MV,                          \
+        .uV_step        = STEP_25_MV,                           \
+        .n_voltages     = S2MPS11_BUCK9_N_VOLTAGES,             \
+        .ramp_delay     = S2MPS11_RAMP_DELAY,                   \
+        .vsel_reg       = S2MPS11_REG_B9CTRL2,                  \
+        .vsel_mask      = S2MPS11_BUCK9_VSEL_MASK,              \
+        .enable_reg     = S2MPS11_REG_B9CTRL1,                  \
+        .enable_mask    = S2MPS11_ENABLE_MASK                   \
+}
+
 static const struct regulator_desc s2mps11_regulators[] = {
         regulator_desc_s2mps11_ldo(1, STEP_25_MV),
         regulator_desc_s2mps11_ldo(2, STEP_50_MV),
@@ -368,11 +384,11 @@ static const struct regulator_desc s2mps11_regulators[] = {
         regulator_desc_s2mps11_buck1_4(3),
         regulator_desc_s2mps11_buck1_4(4),
         regulator_desc_s2mps11_buck5,
-        regulator_desc_s2mps11_buck6_10(6, MIN_600_MV, STEP_6_25_MV),
-        regulator_desc_s2mps11_buck6_10(7, MIN_600_MV, STEP_6_25_MV),
-        regulator_desc_s2mps11_buck6_10(8, MIN_600_MV, STEP_6_25_MV),
-        regulator_desc_s2mps11_buck6_10(9, MIN_3000_MV, STEP_25_MV),
-        regulator_desc_s2mps11_buck6_10(10, MIN_750_MV, STEP_12_5_MV),
+        regulator_desc_s2mps11_buck67810(6, MIN_600_MV, STEP_6_25_MV),
+        regulator_desc_s2mps11_buck67810(7, MIN_600_MV, STEP_6_25_MV),
+        regulator_desc_s2mps11_buck67810(8, MIN_600_MV, STEP_6_25_MV),
+        regulator_desc_s2mps11_buck9,
+        regulator_desc_s2mps11_buck67810(10, MIN_750_MV, STEP_12_5_MV),
 };
 
 static struct regulator_ops s2mps14_reg_ops;
diff --git a/include/linux/mfd/samsung/s2mps11.h b/include/linux/mfd/samsung/s2mps11.h
index b288965e8101..2c14eeca46f0 100644
--- a/include/linux/mfd/samsung/s2mps11.h
+++ b/include/linux/mfd/samsung/s2mps11.h
@@ -173,10 +173,12 @@ enum s2mps11_regulators {
 
 #define S2MPS11_LDO_VSEL_MASK   0x3F
 #define S2MPS11_BUCK_VSEL_MASK  0xFF
+#define S2MPS11_BUCK9_VSEL_MASK 0x1F
 #define S2MPS11_ENABLE_MASK     (0x03 << S2MPS11_ENABLE_SHIFT)
 #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_BUCK9_N_VOLTAGES (S2MPS11_BUCK9_VSEL_MASK + 1)
 #define S2MPS11_RAMP_DELAY      25000           /* uV/us */
 
 #define S2MPS11_CTRL1_PWRHOLD_MASK      BIT(4)