3 files changed, 39 insertions, 6 deletions

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 99b9362331b5..a847f8231337 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -700,8 +700,8 @@ config REGULATOR_RN5T618
         tristate "Ricoh RN5T567/618 voltage regulators"
         depends on MFD_RN5T618
         help
-          Say y here to support the regulators found on Ricoh RN5T567 or
-          RN5T618 PMIC.
+          Say y here to support the regulators found on Ricoh RN5T567,
+          RN5T618 or RC5T619 PMIC.
 
 config REGULATOR_RT5033
         tristate "Richtek RT5033 Regulators"
diff --git a/drivers/regulator/rn5t618-regulator.c b/drivers/regulator/rn5t618-regulator.c
index 8d2819e36654..ef2be56460fe 100644
--- a/drivers/regulator/rn5t618-regulator.c
+++ b/drivers/regulator/rn5t618-regulator.c
@@ -79,6 +79,29 @@ static struct regulator_desc rn5t618_regulators[] = {
         REG(LDORTC2, LDOEN2, BIT(5), LDORTC2DAC, 0x7f, 900000, 3500000, 25000),
 };
 
+static struct regulator_desc rc5t619_regulators[] = {
+        /* DCDC */
+        REG(DCDC1, DC1CTL, BIT(0), DC1DAC, 0xff, 600000, 3500000, 12500),
+        REG(DCDC2, DC2CTL, BIT(0), DC2DAC, 0xff, 600000, 3500000, 12500),
+        REG(DCDC3, DC3CTL, BIT(0), DC3DAC, 0xff, 600000, 3500000, 12500),
+        REG(DCDC4, DC4CTL, BIT(0), DC4DAC, 0xff, 600000, 3500000, 12500),
+        REG(DCDC5, DC5CTL, BIT(0), DC5DAC, 0xff, 600000, 3500000, 12500),
+        /* LDO */
+        REG(LDO1, LDOEN1, BIT(0), LDO1DAC, 0x7f, 900000, 3500000, 25000),
+        REG(LDO2, LDOEN1, BIT(1), LDO2DAC, 0x7f, 900000, 3500000, 25000),
+        REG(LDO3, LDOEN1, BIT(2), LDO3DAC, 0x7f, 900000, 3500000, 25000),
+        REG(LDO4, LDOEN1, BIT(3), LDO4DAC, 0x7f, 900000, 3500000, 25000),
+        REG(LDO5, LDOEN1, BIT(4), LDO5DAC, 0x7f, 600000, 3500000, 25000),
+        REG(LDO6, LDOEN1, BIT(5), LDO6DAC, 0x7f, 600000, 3500000, 25000),
+        REG(LDO7, LDOEN1, BIT(6), LDO7DAC, 0x7f, 900000, 3500000, 25000),
+        REG(LDO8, LDOEN1, BIT(7), LDO8DAC, 0x7f, 900000, 3500000, 25000),
+        REG(LDO9, LDOEN2, BIT(0), LDO9DAC, 0x7f, 900000, 3500000, 25000),
+        REG(LDO10, LDOEN2, BIT(0), LDO10DAC, 0x7f, 900000, 3500000, 25000),
+        /* LDO RTC */
+        REG(LDORTC1, LDOEN2, BIT(4), LDORTCDAC, 0x7f, 1700000, 3500000, 25000),
+        REG(LDORTC2, LDOEN2, BIT(5), LDORTC2DAC, 0x7f, 900000, 3500000, 25000),
+};
+
 static int rn5t618_regulator_probe(struct platform_device *pdev)
 {
         struct rn5t618 *rn5t618 = dev_get_drvdata(pdev->dev.parent);
@@ -86,13 +109,20 @@ static int rn5t618_regulator_probe(struct platform_device *pdev)
         struct regulator_dev *rdev;
         struct regulator_desc *regulators;
         int i;
+        int num_regulators = 0;
 
         switch (rn5t618->variant) {
         case RN5T567:
                 regulators = rn5t567_regulators;
+                num_regulators = ARRAY_SIZE(rn5t567_regulators);
                 break;
         case RN5T618:
                 regulators = rn5t618_regulators;
+                num_regulators = ARRAY_SIZE(rn5t618_regulators);
+                break;
+        case RC5T619:
+                regulators = rc5t619_regulators;
+                num_regulators = ARRAY_SIZE(rc5t619_regulators);
                 break;
         default:
                 return -EINVAL;
@@ -101,10 +131,7 @@ static int rn5t618_regulator_probe(struct platform_device *pdev)
         config.dev = pdev->dev.parent;
         config.regmap = rn5t618->regmap;
 
-        for (i = 0; i < RN5T618_REG_NUM; i++) {
-                if (!regulators[i].name)
-                        continue;
-
+        for (i = 0; i < num_regulators; i++) {
                 rdev = devm_regulator_register(&pdev->dev,
                                                &regulators[i],
                                                &config);
diff --git a/include/linux/mfd/rn5t618.h b/include/linux/mfd/rn5t618.h
index e5a6cdeb77db..d61bc58aba8a 100644
--- a/include/linux/mfd/rn5t618.h
+++ b/include/linux/mfd/rn5t618.h
@@ -226,11 +226,17 @@ enum {
         RN5T618_DCDC2,
         RN5T618_DCDC3,
         RN5T618_DCDC4,
+        RN5T618_DCDC5,
         RN5T618_LDO1,
         RN5T618_LDO2,
         RN5T618_LDO3,
         RN5T618_LDO4,
         RN5T618_LDO5,
+        RN5T618_LDO6,
+        RN5T618_LDO7,
+        RN5T618_LDO8,
+        RN5T618_LDO9,
+        RN5T618_LDO10,
         RN5T618_LDORTC1,
         RN5T618_LDORTC2,
         RN5T618_REG_NUM,