Merge tag 'regulator-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator updates from Mark Brown:
 "A very small set of updates for the regulator API this time around,
  there's a few bug fixes and also:

   - Conversion of the regulator API to use GPIO descriptors rather than
     numbers from Linus Walleij.

   - New drivers for Marvell 88PG86x and Qualcomm PM8998 and PMI8998"

* tag 'regulator-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: qcom: smd: Add pm8998 and pmi8998 regulators
  regulator: core: Add missing blank line between functions
  regulator: qcom_smd: Drop regulator/{machine,of_regulator} includes
  regulator: giving regulator controlling gpios a non-empty label when used through the devicetree.
  regulator: gpio: Fix some error handling paths in 'gpio_regulator_probe()'
  regulator: 88pg86x: new i2c dual regulator chip
  regulator: 88pg86x: add DT bindings document
  regulator: da9211: Pass descriptors instead of GPIO numbers
  regulator: da9055: Pass descriptor instead of GPIO number
  regulator: core: Support passing an initialized GPIO enable descriptor
  regulator: dt: regulator-name is required property
  regulator: of: Add a missing 'of_node_put()' in an error handling path of 'of_regulator_match()'

17 files changed, 367 insertions, 37 deletions

diff --git a/Documentation/devicetree/bindings/regulator/88pg86x.txt b/Documentation/devicetree/bindings/regulator/88pg86x.txt
new file mode 100644
index 000000000000..13b7f49a2ea8
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/88pg86x.txt
@@ -0,0 +1,22 @@
+Marvell 88PG867/88PG868 voltage regulators
+
+Required properties:
+- compatible: one of "marvell,88pg867", "marvell,88pg868";
+- reg: I2C slave address.
+
+Optional subnodes for regulators: "buck1", "buck2", using common regulator
+bindings given in <Documentation/devicetree/bindings/regulator/regulator.txt>.
+
+Example:
+
+        pg868@19 {
+                compatible = "marvell,88pg868";
+                reg = <0x19>;
+
+                vcpu: buck1 {
+                        regulator-boot-on;
+                        regulator-always-on;
+                        regulator-min-microvolt = <1000000>;
+                        regulator-max-microvolt = <1350000>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/regulator/fixed-regulator.txt b/Documentation/devicetree/bindings/regulator/fixed-regulator.txt
index 4fae41d54798..0c2a6c8a1536 100644
--- a/Documentation/devicetree/bindings/regulator/fixed-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/fixed-regulator.txt
@@ -2,6 +2,7 @@ Fixed Voltage regulators
 
 Required properties:
 - compatible: Must be "regulator-fixed";
+- regulator-name: Defined in regulator.txt as optional, but required here.
 
 Optional properties:
 - gpio: gpio to use for enable control
diff --git a/Documentation/devicetree/bindings/regulator/gpio-regulator.txt b/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
index dd1ed789728e..1f496159e2bb 100644
--- a/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
@@ -2,6 +2,8 @@ GPIO controlled regulators
 
 Required properties:
 - compatible            : Must be "regulator-gpio".
+- regulator-name        : Defined in regulator.txt as optional, but required
+                          here.
 - states                : Selection of available voltages and GPIO configs.
                           if there are no states, then use a fixed regulator
 
diff --git a/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt b/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt
index 4e3dfb5b5f16..58a1d97972f5 100644
--- a/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt
@@ -23,7 +23,9 @@ Regulator nodes are identified by their compatible:
                     "qcom,rpm-pm8916-regulators"
                     "qcom,rpm-pm8941-regulators"
                     "qcom,rpm-pm8994-regulators"
+                    "qcom,rpm-pm8998-regulators"
                     "qcom,rpm-pma8084-regulators"
+                    "qcom,rpm-pmi8998-regulators"
 
 - vdd_s1-supply:
 - vdd_s2-supply:
@@ -131,6 +133,38 @@ Regulator nodes are identified by their compatible:
 - vdd_s10-supply:
 - vdd_s11-supply:
 - vdd_s12-supply:
+- vdd_s13-supply:
+- vdd_l1_l27-supply:
+- vdd_l20_l24-supply:
+- vdd_l26-supply:
+- vdd_l2_l8_l17-supply:
+- vdd_l3_l11-supply:
+- vdd_l4_l5-supply:
+- vdd_l6-supply:
+- vdd_l7_l12_l14_l15-supply:
+- vdd_l9-supply:
+- vdd_l10_l23_l25-supply:
+- vdd_l13_l19_l21-supply:
+- vdd_l16_l28-supply:
+- vdd_l18_l22-supply:
+- vdd_lvs1_lvs2-supply:
+        Usage: optional (pmi8998 only)
+        Value type: <phandle>
+        Definition: reference to regulator supplying the input pin, as
+                    described in the data sheet
+
+- vdd_s1-supply:
+- vdd_s2-supply:
+- vdd_s3-supply:
+- vdd_s4-supply:
+- vdd_s5-supply:
+- vdd_s6-supply:
+- vdd_s7-supply:
+- vdd_s8-supply:
+- vdd_s9-supply:
+- vdd_s10-supply:
+- vdd_s11-supply:
+- vdd_s12-supply:
 - vdd_l1_l11-supply:
 - vdd_l2_l3_l4_l27-supply:
 - vdd_l5_l7-supply:
@@ -148,6 +182,12 @@ Regulator nodes are identified by their compatible:
         Definition: reference to regulator supplying the input pin, as
                     described in the data sheet
 
+- vdd_bob-supply:
+        Usage: optional (pmi8998 only)
+        Value type: <phandle>
+        Definition: reference to regulator supplying the input pin, as
+                    described in the data sheet
+
 The regulator node houses sub-nodes for each regulator within the device. Each
 sub-node is identified using the node's name, with valid values listed for each
 of the pmics below.
@@ -169,11 +209,19 @@ pm8994:
         l6, l7, l8, l9, l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l20,
         l21, l22, l23, l24, l25, l26, l27, l28, l29, l30, l31, l32, lvs1, lvs2
 
+pm8998:
+        s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, l1, l2, l3, l4,
+        l5, l6, l7, l8, l9, l10, l11, l12, l13, l14, l15, l16, l17, l18, l19,
+        l20, l21, l22, l23, l24, l25, l26, l27, l28, lvs1, lvs2
+
 pma8084:
         s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, l1, l2, l3, l4, l5,
         l6, l7, l8, l9, l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l20,
         l21, l22, l23, l24, l25, l26, l27, lvs1, lvs2, lvs3, lvs4, 5vs1
 
+pmi8998:
+        bob
+
 The content of each sub-node is defined by the standard binding for regulators -
 see regulator.txt.
 
diff --git a/drivers/regulator/88pg86x.c b/drivers/regulator/88pg86x.c
new file mode 100644
index 000000000000..d5ef55c81185
--- /dev/null
+++ b/drivers/regulator/88pg86x.c
@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/of.h>
+#include <linux/regulator/driver.h>
+#include <linux/regmap.h>
+
+static const struct regulator_ops pg86x_ops = {
+        .set_voltage_sel = regulator_set_voltage_sel_regmap,
+        .get_voltage_sel = regulator_get_voltage_sel_regmap,
+        .list_voltage = regulator_list_voltage_linear_range,
+};
+
+static const struct regulator_linear_range pg86x_buck1_ranges[] = {
+        REGULATOR_LINEAR_RANGE(      0,  0, 10,     0),
+        REGULATOR_LINEAR_RANGE(1000000, 11, 34, 25000),
+        REGULATOR_LINEAR_RANGE(1600000, 35, 47, 50000),
+};
+
+static const struct regulator_linear_range pg86x_buck2_ranges[] = {
+        REGULATOR_LINEAR_RANGE(      0,  0, 15,     0),
+        REGULATOR_LINEAR_RANGE(1000000, 16, 39, 25000),
+        REGULATOR_LINEAR_RANGE(1600000, 40, 52, 50000),
+};
+
+static const struct regulator_desc pg86x_regulators[] = {
+        {
+                .id = 0,
+                .type = REGULATOR_VOLTAGE,
+                .name = "buck1",
+                .of_match = of_match_ptr("buck1"),
+                .n_voltages = 11 + 24 + 13,
+                .linear_ranges = pg86x_buck1_ranges,
+                .n_linear_ranges = 3,
+                .vsel_reg  = 0x24,
+                .vsel_mask = 0xff,
+                .ops = &pg86x_ops,
+                .owner = THIS_MODULE
+        },
+        {
+                .id = 1,
+                .type = REGULATOR_VOLTAGE,
+                .name = "buck2",
+                .of_match = of_match_ptr("buck2"),
+                .n_voltages = 16 + 24 + 13,
+                .linear_ranges = pg86x_buck2_ranges,
+                .n_linear_ranges = 3,
+                .vsel_reg  = 0x13,
+                .vsel_mask = 0xff,
+                .ops = &pg86x_ops,
+                .owner = THIS_MODULE
+        },
+};
+
+static const struct regmap_config pg86x_regmap = {
+        .reg_bits = 8,
+        .val_bits = 8,
+};
+
+static int pg86x_i2c_probe(struct i2c_client *i2c)
+{
+        int id, ret;
+        struct regulator_config config = {.dev = &i2c->dev};
+        struct regmap *regmap = devm_regmap_init_i2c(i2c, &pg86x_regmap);
+
+        if (IS_ERR(regmap)) {
+                ret = PTR_ERR(regmap);
+                dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
+                return ret;
+        }
+
+        for (id = 0; id < ARRAY_SIZE(pg86x_regulators); id++) {
+                struct regulator_dev *rdev;
+                rdev = devm_regulator_register(&i2c->dev,
+                                               &pg86x_regulators[id],
+                                               &config);
+                if (IS_ERR(rdev)) {
+                        ret = PTR_ERR(rdev);
+                        dev_err(&i2c->dev, "failed to register %s: %d\n",
+                                pg86x_regulators[id].name, ret);
+                        return ret;
+                }
+        }
+        return 0;
+}
+
+static const struct of_device_id pg86x_dt_ids [] = {
+        { .compatible = "marvell,88pg867" },
+        { .compatible = "marvell,88pg868" },
+        { }
+};
+MODULE_DEVICE_TABLE(of, pg86x_dt_ids);
+
+static const struct i2c_device_id pg86x_i2c_id[] = {
+        { "88pg867", },
+        { "88pg868", },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, pg86x_i2c_id);
+
+static struct i2c_driver pg86x_regulator_driver = {
+        .driver = {
+                .name = "88pg86x",
+                .of_match_table = of_match_ptr(pg86x_dt_ids),
+        },
+        .probe_new = pg86x_i2c_probe,
+        .id_table = pg86x_i2c_id,
+};
+
+module_i2c_driver(pg86x_regulator_driver);
+
+MODULE_DESCRIPTION("Marvell 88PG86X voltage regulator");
+MODULE_AUTHOR("Alexander Monakov <amonakov@gmail.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index b27417ca188a..097f61784a7d 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -54,6 +54,15 @@ config REGULATOR_USERSPACE_CONSUMER
 
           If unsure, say no.
 
+config REGULATOR_88PG86X
+        tristate "Marvell 88PG86X voltage regulators"
+        depends on I2C
+        select REGMAP_I2C
+        help
+          This driver supports Marvell 88PG867 and 88PG868 voltage regulators.
+          They provide two I2C-controlled DC/DC step-down converters with
+          sleep mode and separate enable pins.
+
 config REGULATOR_88PM800
         tristate "Marvell 88PM800 Power regulators"
         depends on MFD_88PM800
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 19fea09ba10a..590674fbecd7 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o
 obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o
 obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o
 
+obj-$(CONFIG_REGULATOR_88PG86X) += 88pg86x.o
 obj-$(CONFIG_REGULATOR_88PM800) += 88pm800.o
 obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o
 obj-$(CONFIG_REGULATOR_CPCAP) += cpcap-regulator.o
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 1fc0c0811da4..d4803460a557 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1937,7 +1937,10 @@ static int regulator_ena_gpio_request(struct regulator_dev *rdev,
         struct gpio_desc *gpiod;
         int ret;
 
-        gpiod = gpio_to_desc(config->ena_gpio);
+        if (config->ena_gpiod)
+                gpiod = config->ena_gpiod;
+        else
+                gpiod = gpio_to_desc(config->ena_gpio);
 
         list_for_each_entry(pin, &regulator_ena_gpio_list, list) {
                 if (pin->gpiod == gpiod) {
@@ -1947,15 +1950,18 @@ static int regulator_ena_gpio_request(struct regulator_dev *rdev,
                 }
         }
 
-        ret = gpio_request_one(config->ena_gpio,
-                                GPIOF_DIR_OUT | config->ena_gpio_flags,
-                                rdev_get_name(rdev));
-        if (ret)
-                return ret;
+        if (!config->ena_gpiod) {
+                ret = gpio_request_one(config->ena_gpio,
+                                       GPIOF_DIR_OUT | config->ena_gpio_flags,
+                                       rdev_get_name(rdev));
+                if (ret)
+                        return ret;
+        }
 
         pin = kzalloc(sizeof(struct regulator_enable_gpio), GFP_KERNEL);
         if (pin == NULL) {
-                gpio_free(config->ena_gpio);
+                if (!config->ena_gpiod)
+                        gpio_free(config->ena_gpio);
                 return -ENOMEM;
         }
 
@@ -4154,8 +4160,9 @@ regulator_register(const struct regulator_desc *regulator_desc,
                         goto clean;
         }
 
-        if ((config->ena_gpio || config->ena_gpio_initialized) &&
-            gpio_is_valid(config->ena_gpio)) {
+        if (config->ena_gpiod ||
+            ((config->ena_gpio || config->ena_gpio_initialized) &&
+             gpio_is_valid(config->ena_gpio))) {
                 mutex_lock(&regulator_list_mutex);
                 ret = regulator_ena_gpio_request(rdev, config);
                 mutex_unlock(&regulator_list_mutex);
@@ -4301,6 +4308,7 @@ static int regulator_suspend_late(struct device *dev)
         return class_for_each_device(&regulator_class, NULL, &state,
                                      _regulator_suspend_late);
 }
+
 static int _regulator_resume_early(struct device *dev, void *data)
 {
         int ret = 0;
diff --git a/drivers/regulator/da9055-regulator.c b/drivers/regulator/da9055-regulator.c
index d029c941a1e1..f40c3b8644ae 100644
--- a/drivers/regulator/da9055-regulator.c
+++ b/drivers/regulator/da9055-regulator.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
@@ -455,8 +456,7 @@ static int da9055_gpio_init(struct da9055_regulator *regulator,
                 char name[18];
                 int gpio_mux = pdata->gpio_ren[id];
 
-                config->ena_gpio = pdata->ena_gpio[id];
-                config->ena_gpio_flags = GPIOF_OUT_INIT_HIGH;
+                config->ena_gpiod = pdata->ena_gpiods[id];
                 config->ena_gpio_invert = 1;
 
                 /*
diff --git a/drivers/regulator/da9211-regulator.c b/drivers/regulator/da9211-regulator.c
index 9b8f47617724..6c122b3df5d0 100644
--- a/drivers/regulator/da9211-regulator.c
+++ b/drivers/regulator/da9211-regulator.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/err.h>
-#include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -25,7 +24,7 @@
 #include <linux/regmap.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
-#include <linux/of_gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/regulator/of_regulator.h>
 #include <linux/regulator/da9211.h>
 #include "da9211-regulator.h"
@@ -294,9 +293,12 @@ static struct da9211_pdata *da9211_parse_regulators_dt(
 
                 pdata->init_data[n] = da9211_matches[i].init_data;
                 pdata->reg_node[n] = da9211_matches[i].of_node;
-                pdata->gpio_ren[n] =
-                        of_get_named_gpio(da9211_matches[i].of_node,
-                                "enable-gpios", 0);
+                pdata->gpiod_ren[n] = devm_gpiod_get_from_of_node(dev,
+                                                                  da9211_matches[i].of_node,
+                                                                  "enable",
+                                                                  0,
+                                                                  GPIOD_OUT_HIGH,
+                                                                  "da9211-enable");
                 n++;
         }
 
@@ -382,13 +384,10 @@ static int da9211_regulator_init(struct da9211 *chip)
                 config.regmap = chip->regmap;
                 config.of_node = chip->pdata->reg_node[i];
 
-                if (gpio_is_valid(chip->pdata->gpio_ren[i])) {
-                        config.ena_gpio = chip->pdata->gpio_ren[i];
-                        config.ena_gpio_initialized = true;
-                } else {
-                        config.ena_gpio = -EINVAL;
-                        config.ena_gpio_initialized = false;
-                }
+                if (chip->pdata->gpiod_ren[i])
+                        config.ena_gpiod = chip->pdata->gpiod_ren[i];
+                else
+                        config.ena_gpiod = NULL;
 
                 chip->rdev[i] = devm_regulator_register(chip->dev,
                         &da9211_regulators[i], &config);
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index 0fce06acfaec..a86b8997bb54 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -196,6 +196,7 @@ of_get_gpio_regulator_config(struct device *dev, struct device_node *np,
                                 break;
                         }
                         config->gpios[i].gpio = gpio;
+                        config->gpios[i].label = config->supply_name;
                         if (proplen > 0) {
                                 of_property_read_u32_index(np, "gpios-states",
                                                            i, &ret);
@@ -271,8 +272,7 @@ static int gpio_regulator_probe(struct platform_device *pdev)
         drvdata->desc.name = kstrdup(config->supply_name, GFP_KERNEL);
         if (drvdata->desc.name == NULL) {
                 dev_err(&pdev->dev, "Failed to allocate supply name\n");
-                ret = -ENOMEM;
-                goto err;
+                return -ENOMEM;
         }
 
         if (config->nr_gpios != 0) {
@@ -292,7 +292,7 @@ static int gpio_regulator_probe(struct platform_device *pdev)
                                 dev_err(&pdev->dev,
                                         "Could not obtain regulator setting GPIOs: %d\n",
                                         ret);
-                        goto err_memstate;
+                        goto err_memgpio;
                 }
         }
 
@@ -303,7 +303,7 @@ static int gpio_regulator_probe(struct platform_device *pdev)
         if (drvdata->states == NULL) {
                 dev_err(&pdev->dev, "Failed to allocate state data\n");
                 ret = -ENOMEM;
-                goto err_memgpio;
+                goto err_stategpio;
         }
         drvdata->nr_states = config->nr_states;
 
@@ -324,7 +324,7 @@ static int gpio_regulator_probe(struct platform_device *pdev)
         default:
                 dev_err(&pdev->dev, "No regulator type set\n");
                 ret = -EINVAL;
-                goto err_memgpio;
+                goto err_memstate;
         }
 
         /* build initial state from gpio init data. */
@@ -361,22 +361,21 @@ static int gpio_regulator_probe(struct platform_device *pdev)
         if (IS_ERR(drvdata->dev)) {
                 ret = PTR_ERR(drvdata->dev);
                 dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);
-                goto err_stategpio;
+                goto err_memstate;
         }
 
         platform_set_drvdata(pdev, drvdata);
 
         return 0;
 
-err_stategpio:
-        gpio_free_array(drvdata->gpios, drvdata->nr_gpios);
 err_memstate:
         kfree(drvdata->states);
+err_stategpio:
+        gpio_free_array(drvdata->gpios, drvdata->nr_gpios);
 err_memgpio:
         kfree(drvdata->gpios);
 err_name:
         kfree(drvdata->desc.name);
-err:
         return ret;
 }
 
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 092ed6efb3ec..f47264fa1940 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -321,6 +321,7 @@ int of_regulator_match(struct device *dev, struct device_node *node,
                                 dev_err(dev,
                                         "failed to parse DT for regulator %s\n",
                                         child->name);
+                                of_node_put(child);
                                 return -EINVAL;
                         }
                         match->of_node = of_node_get(child);
diff --git a/drivers/regulator/qcom_smd-regulator.c b/drivers/regulator/qcom_smd-regulator.c
index 940fe1b78411..fe2fb36803e0 100644
--- a/drivers/regulator/qcom_smd-regulator.c
+++ b/drivers/regulator/qcom_smd-regulator.c
@@ -17,8 +17,6 @@
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
-#include <linux/regulator/machine.h>
-#include <linux/regulator/of_regulator.h>
 #include <linux/soc/qcom/smd-rpm.h>
 
 struct qcom_rpm_reg {
@@ -165,6 +163,15 @@ static const struct regulator_ops rpm_switch_ops = {
         .is_enabled = rpm_reg_is_enabled,
 };
 
+static const struct regulator_ops rpm_bob_ops = {
+        .enable = rpm_reg_enable,
+        .disable = rpm_reg_disable,
+        .is_enabled = rpm_reg_is_enabled,
+
+        .get_voltage = rpm_reg_get_voltage,
+        .set_voltage = rpm_reg_set_voltage,
+};
+
 static const struct regulator_desc pma8084_hfsmps = {
         .linear_ranges = (struct regulator_linear_range[]) {
                 REGULATOR_LINEAR_RANGE(375000,  0,  95, 12500),
@@ -355,6 +362,64 @@ static const struct regulator_desc pm8994_lnldo = {
         .ops = &rpm_smps_ldo_ops_fixed,
 };
 
+static const struct regulator_desc pm8998_ftsmps = {
+        .linear_ranges = (struct regulator_linear_range[]) {
+                REGULATOR_LINEAR_RANGE(320000, 0, 258, 4000),
+        },
+        .n_linear_ranges = 1,
+        .n_voltages = 259,
+        .ops = &rpm_smps_ldo_ops,
+};
+
+static const struct regulator_desc pm8998_hfsmps = {
+        .linear_ranges = (struct regulator_linear_range[]) {
+                REGULATOR_LINEAR_RANGE(320000, 0, 215, 8000),
+        },
+        .n_linear_ranges = 1,
+        .n_voltages = 216,
+        .ops = &rpm_smps_ldo_ops,
+};
+
+static const struct regulator_desc pm8998_nldo = {
+        .linear_ranges = (struct regulator_linear_range[]) {
+                REGULATOR_LINEAR_RANGE(312000, 0, 127, 8000),
+        },
+        .n_linear_ranges = 1,
+        .n_voltages = 128,
+        .ops = &rpm_smps_ldo_ops,
+};
+
+static const struct regulator_desc pm8998_pldo = {
+        .linear_ranges = (struct regulator_linear_range[]) {
+                REGULATOR_LINEAR_RANGE(1664000, 0, 255, 8000),
+        },
+        .n_linear_ranges = 1,
+        .n_voltages = 256,
+        .ops = &rpm_smps_ldo_ops,
+};
+
+static const struct regulator_desc pm8998_pldo_lv = {
+        .linear_ranges = (struct regulator_linear_range[]) {
+                REGULATOR_LINEAR_RANGE(1256000, 0, 127, 8000),
+        },
+        .n_linear_ranges = 1,
+        .n_voltages = 128,
+        .ops = &rpm_smps_ldo_ops,
+};
+
+static const struct regulator_desc pm8998_switch = {
+        .ops = &rpm_switch_ops,
+};
+
+static const struct regulator_desc pmi8998_bob = {
+        .linear_ranges = (struct regulator_linear_range[]) {
+                REGULATOR_LINEAR_RANGE(1824000, 0, 83, 32000),
+        },
+        .n_linear_ranges = 1,
+        .n_voltages = 84,
+        .ops = &rpm_bob_ops,
+};
+
 struct rpm_regulator_data {
         const char *name;
         u32 type;
@@ -544,12 +609,66 @@ static const struct rpm_regulator_data rpm_pm8994_regulators[] = {
         {}
 };
 
+static const struct rpm_regulator_data rpm_pm8998_regulators[] = {
+        { "s1", QCOM_SMD_RPM_SMPA, 1, &pm8998_ftsmps, "vdd_s1" },
+        { "s2", QCOM_SMD_RPM_SMPA, 2, &pm8998_ftsmps, "vdd_s2" },
+        { "s3", QCOM_SMD_RPM_SMPA, 3, &pm8998_hfsmps, "vdd_s3" },
+        { "s4", QCOM_SMD_RPM_SMPA, 4, &pm8998_hfsmps, "vdd_s4" },
+        { "s5", QCOM_SMD_RPM_SMPA, 5, &pm8998_hfsmps, "vdd_s5" },
+        { "s6", QCOM_SMD_RPM_SMPA, 6, &pm8998_ftsmps, "vdd_s6" },
+        { "s7", QCOM_SMD_RPM_SMPA, 7, &pm8998_ftsmps, "vdd_s7" },
+        { "s8", QCOM_SMD_RPM_SMPA, 8, &pm8998_ftsmps, "vdd_s8" },
+        { "s9", QCOM_SMD_RPM_SMPA, 9, &pm8998_ftsmps, "vdd_s9" },
+        { "s10", QCOM_SMD_RPM_SMPA, 10, &pm8998_ftsmps, "vdd_s10" },
+        { "s11", QCOM_SMD_RPM_SMPA, 11, &pm8998_ftsmps, "vdd_s11" },
+        { "s12", QCOM_SMD_RPM_SMPA, 12, &pm8998_ftsmps, "vdd_s12" },
+        { "s13", QCOM_SMD_RPM_SMPA, 13, &pm8998_ftsmps, "vdd_s13" },
+        { "l1", QCOM_SMD_RPM_LDOA, 1, &pm8998_nldo, "vdd_l1_l27" },
+        { "l2", QCOM_SMD_RPM_LDOA, 2, &pm8998_nldo, "vdd_l2_l8_l17" },
+        { "l3", QCOM_SMD_RPM_LDOA, 3, &pm8998_nldo, "vdd_l3_l11" },
+        { "l4", QCOM_SMD_RPM_LDOA, 4, &pm8998_nldo, "vdd_l4_l5" },
+        { "l5", QCOM_SMD_RPM_LDOA, 5, &pm8998_nldo, "vdd_l4_l5" },
+        { "l6", QCOM_SMD_RPM_LDOA, 6, &pm8998_pldo, "vdd_l6" },
+        { "l7", QCOM_SMD_RPM_LDOA, 7, &pm8998_pldo_lv, "vdd_l7_l12_l14_l15" },
+        { "l8", QCOM_SMD_RPM_LDOA, 8, &pm8998_nldo, "vdd_l2_l8_l17" },
+        { "l9", QCOM_SMD_RPM_LDOA, 9, &pm8998_pldo, "vdd_l9" },
+        { "l10", QCOM_SMD_RPM_LDOA, 10, &pm8998_pldo, "vdd_l10_l23_l25" },
+        { "l11", QCOM_SMD_RPM_LDOA, 11, &pm8998_nldo, "vdd_l3_l11" },
+        { "l12", QCOM_SMD_RPM_LDOA, 12, &pm8998_pldo_lv, "vdd_l7_l12_l14_l15" },
+        { "l13", QCOM_SMD_RPM_LDOA, 13, &pm8998_pldo, "vdd_l13_l19_l21" },
+        { "l14", QCOM_SMD_RPM_LDOA, 14, &pm8998_pldo_lv, "vdd_l7_l12_l14_l15" },
+        { "l15", QCOM_SMD_RPM_LDOA, 15, &pm8998_pldo_lv, "vdd_l7_l12_l14_l15" },
+        { "l16", QCOM_SMD_RPM_LDOA, 16, &pm8998_pldo, "vdd_l16_l28" },
+        { "l17", QCOM_SMD_RPM_LDOA, 17, &pm8998_nldo, "vdd_l2_l8_l17" },
+        { "l18", QCOM_SMD_RPM_LDOA, 18, &pm8998_pldo, "vdd_l18_l22" },
+        { "l19", QCOM_SMD_RPM_LDOA, 19, &pm8998_pldo, "vdd_l13_l19_l21" },
+        { "l20", QCOM_SMD_RPM_LDOA, 20, &pm8998_pldo, "vdd_l20_l24" },
+        { "l21", QCOM_SMD_RPM_LDOA, 21, &pm8998_pldo, "vdd_l13_l19_l21" },
+        { "l22", QCOM_SMD_RPM_LDOA, 22, &pm8998_pldo, "vdd_l18_l22" },
+        { "l23", QCOM_SMD_RPM_LDOA, 23, &pm8998_pldo, "vdd_l10_l23_l25" },
+        { "l24", QCOM_SMD_RPM_LDOA, 24, &pm8998_pldo, "vdd_l20_l24" },
+        { "l25", QCOM_SMD_RPM_LDOA, 25, &pm8998_pldo, "vdd_l10_l23_l25" },
+        { "l26", QCOM_SMD_RPM_LDOA, 26, &pm8998_nldo, "vdd_l26" },
+        { "l27", QCOM_SMD_RPM_LDOA, 27, &pm8998_nldo, "vdd_l1_l27" },
+        { "l28", QCOM_SMD_RPM_LDOA, 28, &pm8998_pldo, "vdd_l16_l28" },
+        { "lvs1", QCOM_SMD_RPM_VSA, 1, &pm8998_switch, "vdd_lvs1_lvs2" },
+        { "lvs2", QCOM_SMD_RPM_VSA, 2, &pm8998_switch, "vdd_lvs1_lvs2" },
+        {}
+};
+
+static const struct rpm_regulator_data rpm_pmi8998_regulators[] = {
+        { "bob", QCOM_SMD_RPM_BOBB, 1, &pmi8998_bob, "vdd_bob" },
+        {}
+};
+
 static const struct of_device_id rpm_of_match[] = {
         { .compatible = "qcom,rpm-pm8841-regulators", .data = &rpm_pm8841_regulators },
         { .compatible = "qcom,rpm-pm8916-regulators", .data = &rpm_pm8916_regulators },
         { .compatible = "qcom,rpm-pm8941-regulators", .data = &rpm_pm8941_regulators },
         { .compatible = "qcom,rpm-pm8994-regulators", .data = &rpm_pm8994_regulators },
+        { .compatible = "qcom,rpm-pm8998-regulators", .data = &rpm_pm8998_regulators },
         { .compatible = "qcom,rpm-pma8084-regulators", .data = &rpm_pma8084_regulators },
+        { .compatible = "qcom,rpm-pmi8998-regulators", .data = &rpm_pmi8998_regulators },
         {}
 };
 MODULE_DEVICE_TABLE(of, rpm_of_match);
diff --git a/include/linux/mfd/da9055/pdata.h b/include/linux/mfd/da9055/pdata.h
index 04e092be4b07..1a94fa2ac309 100644
--- a/include/linux/mfd/da9055/pdata.h
+++ b/include/linux/mfd/da9055/pdata.h
@@ -12,6 +12,7 @@
 #define DA9055_MAX_REGULATORS   8
 
 struct da9055;
+struct gpio_desc;
 
 enum gpio_select {
         NO_GPIO = 0,
@@ -47,7 +48,7 @@ struct da9055_pdata {
          * controls the regulator set A/B, 0 if  not available.
          */
         enum gpio_select *reg_rsel;
-        /* GPIOs to enable regulator, 0 if not available */
-        int *ena_gpio;
+        /* GPIO descriptors to enable regulator, NULL if not available */
+        struct gpio_desc **ena_gpiods;
 };
 #endif /* __DA9055_PDATA_H */
diff --git a/include/linux/regulator/da9211.h b/include/linux/regulator/da9211.h
index f2fd2d3bf58f..d1f2073e4d5f 100644
--- a/include/linux/regulator/da9211.h
+++ b/include/linux/regulator/da9211.h
@@ -21,6 +21,8 @@
 
 #define DA9211_MAX_REGULATORS   2
 
+struct gpio_desc;
+
 enum da9211_chip_id {
         DA9211,
         DA9212,
@@ -39,7 +41,7 @@ struct da9211_pdata {
          * 2 : 2 phase 2 buck
          */
         int num_buck;
-        int gpio_ren[DA9211_MAX_REGULATORS];
+        struct gpio_desc *gpiod_ren[DA9211_MAX_REGULATORS];
         struct device_node *reg_node[DA9211_MAX_REGULATORS];
         struct regulator_init_data *init_data[DA9211_MAX_REGULATORS];
 };
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
index 4c00486b7a78..4fc96cb8e5d7 100644
--- a/include/linux/regulator/driver.h
+++ b/include/linux/regulator/driver.h
@@ -19,6 +19,7 @@
 #include <linux/notifier.h>
 #include <linux/regulator/consumer.h>
 
+struct gpio_desc;
 struct regmap;
 struct regulator_dev;
 struct regulator_config;
@@ -387,6 +388,7 @@ struct regulator_desc {
  *                        initialized, meaning that >= 0 is a valid gpio
  *                        identifier and < 0 is a non existent gpio.
  * @ena_gpio: GPIO controlling regulator enable.
+ * @ena_gpiod: GPIO descriptor controlling regulator enable.
  * @ena_gpio_invert: Sense for GPIO enable control.
  * @ena_gpio_flags: Flags to use when calling gpio_request_one()
  */
@@ -399,6 +401,7 @@ struct regulator_config {
 
         bool ena_gpio_initialized;
         int ena_gpio;
+        struct gpio_desc *ena_gpiod;
         unsigned int ena_gpio_invert:1;
         unsigned int ena_gpio_flags;
 };
diff --git a/include/linux/soc/qcom/smd-rpm.h b/include/linux/soc/qcom/smd-rpm.h
index 9f5c6e53f3a5..9e4fdd861a51 100644
--- a/include/linux/soc/qcom/smd-rpm.h
+++ b/include/linux/soc/qcom/smd-rpm.h
@@ -10,6 +10,7 @@ struct qcom_smd_rpm;
 /*
  * Constants used for addressing resources in the RPM.
  */
+#define QCOM_SMD_RPM_BOBB       0x62626f62
 #define QCOM_SMD_RPM_BOOST      0x61747362
 #define QCOM_SMD_RPM_BUS_CLK    0x316b6c63
 #define QCOM_SMD_RPM_BUS_MASTER 0x73616d62