6 files changed, 143 insertions, 17 deletions

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 0fd6195601ba..96cd55f9e3c5 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -244,7 +244,7 @@ config REGULATOR_DA9210
           interface.
 
 config REGULATOR_DA9211
-        tristate "Dialog Semiconductor DA9211/DA9212/DA9213/DA9214/DA9215 regulator"
+        tristate "Dialog Semiconductor DA9211/DA9212/DA9213/DA9223/DA9214/DA9224/DA9215/DA9225 regulator"
         depends on I2C
         select REGMAP_I2C
         help
diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
index 376a99b7cf5d..181622b2813d 100644
--- a/drivers/regulator/axp20x-regulator.c
+++ b/drivers/regulator/axp20x-regulator.c
@@ -244,6 +244,7 @@ static const struct regulator_desc axp22x_drivevbus_regulator = {
         .ops            = &axp20x_ops_sw,
 };
 
+/* DCDC ranges shared with AXP813 */
 static const struct regulator_linear_range axp803_dcdc234_ranges[] = {
         REGULATOR_LINEAR_RANGE(500000, 0x0, 0x46, 10000),
         REGULATOR_LINEAR_RANGE(1220000, 0x47, 0x4b, 20000),
@@ -426,6 +427,69 @@ static const struct regulator_desc axp809_regulators[] = {
         AXP_DESC_SW(AXP809, SW, "sw", "swin", AXP22X_PWR_OUT_CTRL2, BIT(6)),
 };
 
+static const struct regulator_desc axp813_regulators[] = {
+        AXP_DESC(AXP813, DCDC1, "dcdc1", "vin1", 1600, 3400, 100,
+                 AXP803_DCDC1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL1, BIT(0)),
+        AXP_DESC_RANGES(AXP813, DCDC2, "dcdc2", "vin2", axp803_dcdc234_ranges,
+                        76, AXP803_DCDC2_V_OUT, 0x7f, AXP22X_PWR_OUT_CTRL1,
+                        BIT(1)),
+        AXP_DESC_RANGES(AXP813, DCDC3, "dcdc3", "vin3", axp803_dcdc234_ranges,
+                        76, AXP803_DCDC3_V_OUT, 0x7f, AXP22X_PWR_OUT_CTRL1,
+                        BIT(2)),
+        AXP_DESC_RANGES(AXP813, DCDC4, "dcdc4", "vin4", axp803_dcdc234_ranges,
+                        76, AXP803_DCDC4_V_OUT, 0x7f, AXP22X_PWR_OUT_CTRL1,
+                        BIT(3)),
+        AXP_DESC_RANGES(AXP813, DCDC5, "dcdc5", "vin5", axp803_dcdc5_ranges,
+                        68, AXP803_DCDC5_V_OUT, 0x7f, AXP22X_PWR_OUT_CTRL1,
+                        BIT(4)),
+        AXP_DESC_RANGES(AXP813, DCDC6, "dcdc6", "vin6", axp803_dcdc6_ranges,
+                        72, AXP803_DCDC6_V_OUT, 0x7f, AXP22X_PWR_OUT_CTRL1,
+                        BIT(5)),
+        AXP_DESC_RANGES(AXP813, DCDC7, "dcdc7", "vin7", axp803_dcdc6_ranges,
+                        72, AXP813_DCDC7_V_OUT, 0x7f, AXP22X_PWR_OUT_CTRL1,
+                        BIT(6)),
+        AXP_DESC(AXP813, ALDO1, "aldo1", "aldoin", 700, 3300, 100,
+                 AXP22X_ALDO1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL3, BIT(5)),
+        AXP_DESC(AXP813, ALDO2, "aldo2", "aldoin", 700, 3300, 100,
+                 AXP22X_ALDO2_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL3, BIT(6)),
+        AXP_DESC(AXP813, ALDO3, "aldo3", "aldoin", 700, 3300, 100,
+                 AXP22X_ALDO3_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL3, BIT(7)),
+        AXP_DESC(AXP813, DLDO1, "dldo1", "dldoin", 700, 3300, 100,
+                 AXP22X_DLDO1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(3)),
+        AXP_DESC_RANGES(AXP813, DLDO2, "dldo2", "dldoin", axp803_dldo2_ranges,
+                        32, AXP22X_DLDO2_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2,
+                        BIT(4)),
+        AXP_DESC(AXP813, DLDO3, "dldo3", "dldoin", 700, 3300, 100,
+                 AXP22X_DLDO3_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(5)),
+        AXP_DESC(AXP813, DLDO4, "dldo4", "dldoin", 700, 3300, 100,
+                 AXP22X_DLDO4_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(6)),
+        AXP_DESC(AXP813, ELDO1, "eldo1", "eldoin", 700, 1900, 50,
+                 AXP22X_ELDO1_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(0)),
+        AXP_DESC(AXP813, ELDO2, "eldo2", "eldoin", 700, 1900, 50,
+                 AXP22X_ELDO2_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(1)),
+        AXP_DESC(AXP813, ELDO3, "eldo3", "eldoin", 700, 1900, 50,
+                 AXP22X_ELDO3_V_OUT, 0x1f, AXP22X_PWR_OUT_CTRL2, BIT(2)),
+        /* to do / check ... */
+        AXP_DESC(AXP813, FLDO1, "fldo1", "fldoin", 700, 1450, 50,
+                 AXP803_FLDO1_V_OUT, 0x0f, AXP22X_PWR_OUT_CTRL3, BIT(2)),
+        AXP_DESC(AXP813, FLDO2, "fldo2", "fldoin", 700, 1450, 50,
+                 AXP803_FLDO2_V_OUT, 0x0f, AXP22X_PWR_OUT_CTRL3, BIT(3)),
+        /*
+         * TODO: FLDO3 = {DCDC5, FLDOIN} / 2
+         *
+         * This means FLDO3 effectively switches supplies at runtime,
+         * something the regulator subsystem does not support.
+         */
+        AXP_DESC_FIXED(AXP813, RTC_LDO, "rtc-ldo", "ips", 1800),
+        AXP_DESC_IO(AXP813, LDO_IO0, "ldo-io0", "ips", 700, 3300, 100,
+                    AXP22X_LDO_IO0_V_OUT, 0x1f, AXP20X_GPIO0_CTRL, 0x07,
+                    AXP22X_IO_ENABLED, AXP22X_IO_DISABLED),
+        AXP_DESC_IO(AXP813, LDO_IO1, "ldo-io1", "ips", 700, 3300, 100,
+                    AXP22X_LDO_IO1_V_OUT, 0x1f, AXP20X_GPIO1_CTRL, 0x07,
+                    AXP22X_IO_ENABLED, AXP22X_IO_DISABLED),
+        AXP_DESC_SW(AXP813, SW, "sw", "swin", AXP22X_PWR_OUT_CTRL2, BIT(7)),
+};
+
 static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq)
 {
         struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
@@ -441,9 +505,10 @@ static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq)
                 step = 75;
                 break;
         case AXP803_ID:
+        case AXP813_ID:
                 /*
-                 * AXP803 DCDC work frequency setting has the same range and
-                 * step as AXP22X, but at a different register.
+                 * AXP803/AXP813 DCDC work frequency setting has the same
+                 * range and step as AXP22X, but at a different register.
                  * Fall through to the check below.
                  * (See include/linux/mfd/axp20x.h)
                  */
@@ -561,6 +626,14 @@ static int axp20x_set_dcdc_workmode(struct regulator_dev *rdev, int id, u32 work
                 workmode <<= id - AXP803_DCDC1;
                 break;
 
+        case AXP813_ID:
+                if (id < AXP813_DCDC1 || id > AXP813_DCDC7)
+                        return -EINVAL;
+
+                mask = AXP22X_WORKMODE_DCDCX_MASK(id - AXP813_DCDC1);
+                workmode <<= id - AXP813_DCDC1;
+                break;
+
         default:
                 /* should not happen */
                 WARN_ON(1);
@@ -579,11 +652,12 @@ static bool axp20x_is_polyphase_slave(struct axp20x_dev *axp20x, int id)
         u32 reg = 0;
 
         /*
-         * Currently in our supported AXP variants, only AXP803 and AXP806
-         * have polyphase regulators.
+         * Currently in our supported AXP variants, only AXP803, AXP806,
+         * and AXP813 have polyphase regulators.
          */
         switch (axp20x->variant) {
         case AXP803_ID:
+        case AXP813_ID:
                 regmap_read(axp20x->regmap, AXP803_POLYPHASE_CTRL, &reg);
 
                 switch (id) {
@@ -656,6 +730,12 @@ static int axp20x_regulator_probe(struct platform_device *pdev)
                 regulators = axp809_regulators;
                 nregulators = AXP809_REG_ID_MAX;
                 break;
+        case AXP813_ID:
+                regulators = axp813_regulators;
+                nregulators = AXP813_REG_ID_MAX;
+                drivevbus = of_property_read_bool(pdev->dev.parent->of_node,
+                                                  "x-powers,drive-vbus-en");
+                break;
         default:
                 dev_err(&pdev->dev, "Unsupported AXP variant: %ld\n",
                         axp20x->variant);
@@ -677,6 +757,10 @@ static int axp20x_regulator_probe(struct platform_device *pdev)
                 if (axp20x_is_polyphase_slave(axp20x, i))
                         continue;
 
+                /* Support for AXP813's FLDO3 is not implemented */
+                if (axp20x->variant == AXP813_ID && i == AXP813_FLDO3)
+                        continue;
+
                 /*
                  * Regulators DC1SW and DC5LDO are connected internally,
                  * so we have to handle their supply names separately.
diff --git a/drivers/regulator/da9211-regulator.c b/drivers/regulator/da9211-regulator.c
index aa47280efd32..9b8f47617724 100644
--- a/drivers/regulator/da9211-regulator.c
+++ b/drivers/regulator/da9211-regulator.c
@@ -1,6 +1,6 @@
 /*
  * da9211-regulator.c - Regulator device driver for DA9211/DA9212
- * /DA9213/DA9214/DA9215
+ * /DA9213/DA9223/DA9214/DA9224/DA9215/DA9225
  * Copyright (C) 2015  Dialog Semiconductor Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -496,8 +496,11 @@ static const struct i2c_device_id da9211_i2c_id[] = {
         {"da9211", DA9211},
         {"da9212", DA9212},
         {"da9213", DA9213},
+        {"da9223", DA9223},
         {"da9214", DA9214},
+        {"da9224", DA9224},
         {"da9215", DA9215},
+        {"da9225", DA9225},
         {},
 };
 MODULE_DEVICE_TABLE(i2c, da9211_i2c_id);
@@ -507,8 +510,11 @@ static const struct of_device_id da9211_dt_ids[] = {
         { .compatible = "dlg,da9211", .data = &da9211_i2c_id[0] },
         { .compatible = "dlg,da9212", .data = &da9211_i2c_id[1] },
         { .compatible = "dlg,da9213", .data = &da9211_i2c_id[2] },
-        { .compatible = "dlg,da9214", .data = &da9211_i2c_id[3] },
-        { .compatible = "dlg,da9215", .data = &da9211_i2c_id[4] },
+        { .compatible = "dlg,da9223", .data = &da9211_i2c_id[3] },
+        { .compatible = "dlg,da9214", .data = &da9211_i2c_id[4] },
+        { .compatible = "dlg,da9224", .data = &da9211_i2c_id[5] },
+        { .compatible = "dlg,da9215", .data = &da9211_i2c_id[6] },
+        { .compatible = "dlg,da9225", .data = &da9211_i2c_id[7] },
         {},
 };
 MODULE_DEVICE_TABLE(of, da9211_dt_ids);
@@ -526,5 +532,5 @@ static struct i2c_driver da9211_regulator_driver = {
 module_i2c_driver(da9211_regulator_driver);
 
 MODULE_AUTHOR("James Ban <James.Ban.opensource@diasemi.com>");
-MODULE_DESCRIPTION("DA9211/DA9212/DA9213/DA9214/DA9215 regulator driver");
+MODULE_DESCRIPTION("DA9211/DA9212/DA9213/DA9223/DA9214/DA9224/DA9215/DA9225 regulator driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/regulator/da9211-regulator.h b/drivers/regulator/da9211-regulator.h
index b841bbf330cc..2cb32aab4f82 100644
--- a/drivers/regulator/da9211-regulator.h
+++ b/drivers/regulator/da9211-regulator.h
@@ -1,6 +1,6 @@
 /*
  * da9211-regulator.h - Regulator definitions for DA9211/DA9212
- * /DA9213/DA9214/DA9215
+ * /DA9213/DA9223/DA9214/DA9224/DA9215/DA9225
  * Copyright (C) 2015  Dialog Semiconductor Ltd.
  *
  * This program is free software; you can redistribute it and/or
diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c
index 16c5f84e06a7..0241ada47d04 100644
--- a/drivers/regulator/qcom_spmi-regulator.c
+++ b/drivers/regulator/qcom_spmi-regulator.c
@@ -593,13 +593,20 @@ static int spmi_sw_selector_to_hw(struct spmi_regulator *vreg,
                                   u8 *voltage_sel)
 {
         const struct spmi_voltage_range *range, *end;
+        unsigned offset;
 
         range = vreg->set_points->range;
         end = range + vreg->set_points->count;
 
         for (; range < end; range++) {
                 if (selector < range->n_voltages) {
-                        *voltage_sel = selector;
+                        /*
+                         * hardware selectors between set point min and real
+                         * min are invalid so we ignore them
+                         */
+                        offset = range->set_point_min_uV - range->min_uV;
+                        offset /= range->step_uV;
+                        *voltage_sel = selector + offset;
                         *range_sel = range->range_sel;
                         return 0;
                 }
@@ -613,15 +620,35 @@ static int spmi_sw_selector_to_hw(struct spmi_regulator *vreg,
 static int spmi_hw_selector_to_sw(struct spmi_regulator *vreg, u8 hw_sel,
                                   const struct spmi_voltage_range *range)
 {
-        int sw_sel = hw_sel;
+        unsigned sw_sel = 0;
+        unsigned offset, max_hw_sel;
         const struct spmi_voltage_range *r = vreg->set_points->range;
-
-        while (r != range) {
+        const struct spmi_voltage_range *end = r + vreg->set_points->count;
+
+        for (; r < end; r++) {
+                if (r == range && range->n_voltages) {
+                        /*
+                         * hardware selectors between set point min and real
+                         * min and between set point max and real max are
+                         * invalid so we return an error if they're
+                         * programmed into the hardware
+                         */
+                        offset = range->set_point_min_uV - range->min_uV;
+                        offset /= range->step_uV;
+                        if (hw_sel < offset)
+                                return -EINVAL;
+
+                        max_hw_sel = range->set_point_max_uV - range->min_uV;
+                        max_hw_sel /= range->step_uV;
+                        if (hw_sel > max_hw_sel)
+                                return -EINVAL;
+
+                        return sw_sel + hw_sel - offset;
+                }
                 sw_sel += r->n_voltages;
-                r++;
         }
 
-        return sw_sel;
+        return -EINVAL;
 }
 
 static const struct spmi_voltage_range *
@@ -1619,11 +1646,20 @@ static const struct spmi_regulator_data pm8994_regulators[] = {
         { }
 };
 
+static const struct spmi_regulator_data pmi8994_regulators[] = {
+        { "s1", 0x1400, "vdd_s1", },
+        { "s2", 0x1700, "vdd_s2", },
+        { "s3", 0x1a00, "vdd_s3", },
+        { "l1", 0x4000, "vdd_l1", },
+        { }
+};
+
 static const struct of_device_id qcom_spmi_regulator_match[] = {
         { .compatible = "qcom,pm8841-regulators", .data = &pm8841_regulators },
         { .compatible = "qcom,pm8916-regulators", .data = &pm8916_regulators },
         { .compatible = "qcom,pm8941-regulators", .data = &pm8941_regulators },
         { .compatible = "qcom,pm8994-regulators", .data = &pm8994_regulators },
+        { .compatible = "qcom,pmi8994-regulators", .data = &pmi8994_regulators },
         { }
 };
 MODULE_DEVICE_TABLE(of, qcom_spmi_regulator_match);
diff --git a/drivers/regulator/tps65218-regulator.c b/drivers/regulator/tps65218-regulator.c
index 9aafbb03482d..bc489958fed7 100644
--- a/drivers/regulator/tps65218-regulator.c
+++ b/drivers/regulator/tps65218-regulator.c
@@ -154,7 +154,7 @@ static int tps65218_pmic_set_suspend_disable(struct regulator_dev *dev)
 
         if (!tps->strobes[rid]) {
                 if (rid == TPS65218_DCDC_3)
-                        tps->info[rid]->strobe = 3;
+                        tps->strobes[rid] = 3;
                 else
                         return -EINVAL;
         }