8 files changed, 40 insertions, 35 deletions

diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c
index b85040caaea3..cca18a3c0294 100644
--- a/drivers/regulator/max77686.c
+++ b/drivers/regulator/max77686.c
@@ -379,9 +379,10 @@ static struct regulator_desc regulators[] = {
 };
 
 #ifdef CONFIG_OF
-static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev,
+static int max77686_pmic_dt_parse_pdata(struct platform_device *pdev,
                                         struct max77686_platform_data *pdata)
 {
+        struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent);
         struct device_node *pmic_np, *regulators_np;
         struct max77686_regulator_data *rdata;
         struct of_regulator_match rmatch;
@@ -390,15 +391,15 @@ static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev,
         pmic_np = iodev->dev->of_node;
         regulators_np = of_find_node_by_name(pmic_np, "voltage-regulators");
         if (!regulators_np) {
-                dev_err(iodev->dev, "could not find regulators sub-node\n");
+                dev_err(&pdev->dev, "could not find regulators sub-node\n");
                 return -EINVAL;
         }
 
         pdata->num_regulators = ARRAY_SIZE(regulators);
-        rdata = devm_kzalloc(iodev->dev, sizeof(*rdata) *
+        rdata = devm_kzalloc(&pdev->dev, sizeof(*rdata) *
                              pdata->num_regulators, GFP_KERNEL);
         if (!rdata) {
-                dev_err(iodev->dev,
+                dev_err(&pdev->dev,
                         "could not allocate memory for regulator data\n");
                 return -ENOMEM;
         }
@@ -407,7 +408,7 @@ static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev,
                 rmatch.name = regulators[i].name;
                 rmatch.init_data = NULL;
                 rmatch.of_node = NULL;
-                of_regulator_match(iodev->dev, regulators_np, &rmatch, 1);
+                of_regulator_match(&pdev->dev, regulators_np, &rmatch, 1);
                 rdata[i].initdata = rmatch.init_data;
                 rdata[i].of_node = rmatch.of_node;
         }
@@ -417,7 +418,7 @@ static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev,
         return 0;
 }
 #else
-static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev,
+static int max77686_pmic_dt_parse_pdata(struct platform_device *pdev,
                                         struct max77686_platform_data *pdata)
 {
         return 0;
@@ -440,7 +441,7 @@ static int max77686_pmic_probe(struct platform_device *pdev)
         }
 
         if (iodev->dev->of_node) {
-                ret = max77686_pmic_dt_parse_pdata(iodev, pdata);
+                ret = max77686_pmic_dt_parse_pdata(pdev, pdata);
                 if (ret)
                         return ret;
         }
diff --git a/drivers/regulator/max8907-regulator.c b/drivers/regulator/max8907-regulator.c
index d1a77512d83e..d40cf7fdb546 100644
--- a/drivers/regulator/max8907-regulator.c
+++ b/drivers/regulator/max8907-regulator.c
@@ -237,8 +237,7 @@ static int max8907_regulator_parse_dt(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        ret = of_regulator_match(pdev->dev.parent, regulators,
-                                 max8907_matches,
+        ret = of_regulator_match(&pdev->dev, regulators, max8907_matches,
                                  ARRAY_SIZE(max8907_matches));
         if (ret < 0) {
                 dev_err(&pdev->dev, "Error parsing regulator init data: %d\n",
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index 02be7fcae32f..836908ce505e 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -934,7 +934,7 @@ static struct regulator_desc regulators[] = {
 };
 
 #ifdef CONFIG_OF
-static int max8997_pmic_dt_parse_dvs_gpio(struct max8997_dev *iodev,
+static int max8997_pmic_dt_parse_dvs_gpio(struct platform_device *pdev,
                         struct max8997_platform_data *pdata,
                         struct device_node *pmic_np)
 {
@@ -944,7 +944,7 @@ static int max8997_pmic_dt_parse_dvs_gpio(struct max8997_dev *iodev,
                 gpio = of_get_named_gpio(pmic_np,
                                         "max8997,pmic-buck125-dvs-gpios", i);
                 if (!gpio_is_valid(gpio)) {
-                        dev_err(iodev->dev, "invalid gpio[%d]: %d\n", i, gpio);
+                        dev_err(&pdev->dev, "invalid gpio[%d]: %d\n", i, gpio);
                         return -EINVAL;
                 }
                 pdata->buck125_gpios[i] = gpio;
@@ -952,22 +952,23 @@ static int max8997_pmic_dt_parse_dvs_gpio(struct max8997_dev *iodev,
         return 0;
 }
 
-static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev,
+static int max8997_pmic_dt_parse_pdata(struct platform_device *pdev,
                                         struct max8997_platform_data *pdata)
 {
+        struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
         struct device_node *pmic_np, *regulators_np, *reg_np;
         struct max8997_regulator_data *rdata;
         unsigned int i, dvs_voltage_nr = 1, ret;
 
         pmic_np = iodev->dev->of_node;
         if (!pmic_np) {
-                dev_err(iodev->dev, "could not find pmic sub-node\n");
+                dev_err(&pdev->dev, "could not find pmic sub-node\n");
                 return -ENODEV;
         }
 
         regulators_np = of_find_node_by_name(pmic_np, "regulators");
         if (!regulators_np) {
-                dev_err(iodev->dev, "could not find regulators sub-node\n");
+                dev_err(&pdev->dev, "could not find regulators sub-node\n");
                 return -EINVAL;
         }
 
@@ -976,11 +977,10 @@ static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev,
         for_each_child_of_node(regulators_np, reg_np)
                 pdata->num_regulators++;
 
-        rdata = devm_kzalloc(iodev->dev, sizeof(*rdata) *
+        rdata = devm_kzalloc(&pdev->dev, sizeof(*rdata) *
                                 pdata->num_regulators, GFP_KERNEL);
         if (!rdata) {
-                dev_err(iodev->dev, "could not allocate memory for "
-                                                "regulator data\n");
+                dev_err(&pdev->dev, "could not allocate memory for regulator data\n");
                 return -ENOMEM;
         }
 
@@ -991,14 +991,14 @@ static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev,
                                 break;
 
                 if (i == ARRAY_SIZE(regulators)) {
-                        dev_warn(iodev->dev, "don't know how to configure "
-                                "regulator %s\n", reg_np->name);
+                        dev_warn(&pdev->dev, "don't know how to configure regulator %s\n",
+                                 reg_np->name);
                         continue;
                 }
 
                 rdata->id = i;
-                rdata->initdata = of_get_regulator_init_data(
-                                                iodev->dev, reg_np);
+                rdata->initdata = of_get_regulator_init_data(&pdev->dev,
+                                                             reg_np);
                 rdata->reg_node = reg_np;
                 rdata++;
         }
@@ -1014,7 +1014,7 @@ static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev,
 
         if (pdata->buck1_gpiodvs || pdata->buck2_gpiodvs ||
                                                 pdata->buck5_gpiodvs) {
-                ret = max8997_pmic_dt_parse_dvs_gpio(iodev, pdata, pmic_np);
+                ret = max8997_pmic_dt_parse_dvs_gpio(pdev, pdata, pmic_np);
                 if (ret)
                         return -EINVAL;
 
@@ -1025,8 +1025,7 @@ static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev,
                 } else {
                         if (pdata->buck125_default_idx >= 8) {
                                 pdata->buck125_default_idx = 0;
-                                dev_info(iodev->dev, "invalid value for "
-                                "default dvs index, using 0 instead\n");
+                                dev_info(&pdev->dev, "invalid value for default dvs index, using 0 instead\n");
                         }
                 }
 
@@ -1040,28 +1039,28 @@ static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev,
         if (of_property_read_u32_array(pmic_np,
                                 "max8997,pmic-buck1-dvs-voltage",
                                 pdata->buck1_voltage, dvs_voltage_nr)) {
-                dev_err(iodev->dev, "buck1 voltages not specified\n");
+                dev_err(&pdev->dev, "buck1 voltages not specified\n");
                 return -EINVAL;
         }
 
         if (of_property_read_u32_array(pmic_np,
                                 "max8997,pmic-buck2-dvs-voltage",
                                 pdata->buck2_voltage, dvs_voltage_nr)) {
-                dev_err(iodev->dev, "buck2 voltages not specified\n");
+                dev_err(&pdev->dev, "buck2 voltages not specified\n");
                 return -EINVAL;
         }
 
         if (of_property_read_u32_array(pmic_np,
                                 "max8997,pmic-buck5-dvs-voltage",
                                 pdata->buck5_voltage, dvs_voltage_nr)) {
-                dev_err(iodev->dev, "buck5 voltages not specified\n");
+                dev_err(&pdev->dev, "buck5 voltages not specified\n");
                 return -EINVAL;
         }
 
         return 0;
 }
 #else
-static int max8997_pmic_dt_parse_pdata(struct max8997_dev *iodev,
+static int max8997_pmic_dt_parse_pdata(struct platform_device *pdev,
                                         struct max8997_platform_data *pdata)
 {
         return 0;
@@ -1085,7 +1084,7 @@ static int max8997_pmic_probe(struct platform_device *pdev)
         }
 
         if (iodev->dev->of_node) {
-                ret = max8997_pmic_dt_parse_pdata(iodev, pdata);
+                ret = max8997_pmic_dt_parse_pdata(pdev, pdata);
                 if (ret)
                         return ret;
         }
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c
index 1f0df4046b86..0a8dd1cbee6f 100644
--- a/drivers/regulator/max8998.c
+++ b/drivers/regulator/max8998.c
@@ -65,7 +65,7 @@ static const struct voltage_map_desc ldo9_voltage_map_desc = {
         .min = 2800000, .step = 100000, .max = 3100000,
 };
 static const struct voltage_map_desc ldo10_voltage_map_desc = {
-        .min = 95000,   .step = 50000,  .max = 1300000,
+        .min = 950000,  .step = 50000,  .max = 1300000,
 };
 static const struct voltage_map_desc ldo1213_voltage_map_desc = {
         .min = 800000,  .step = 100000, .max = 3300000,
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 6f684916fd79..66ca769287ab 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -120,6 +120,12 @@ int of_regulator_match(struct device *dev, struct device_node *node,
         if (!dev || !node)
                 return -EINVAL;
 
+        for (i = 0; i < num_matches; i++) {
+                struct of_regulator_match *match = &matches[i];
+                match->init_data = NULL;
+                match->of_node = NULL;
+        }
+
         for_each_child_of_node(node, child) {
                 name = of_get_property(child,
                                         "regulator-compatible", NULL);
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index bd062a2ffbe2..cd9ea2ea1826 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -174,9 +174,9 @@ static struct regulator_ops s2mps11_buck_ops = {
         .min_uV         = S2MPS11_BUCK_MIN2,                    \
         .uV_step        = S2MPS11_BUCK_STEP2,                   \
         .n_voltages     = S2MPS11_BUCK_N_VOLTAGES,              \
-        .vsel_reg       = S2MPS11_REG_B9CTRL2,                  \
+        .vsel_reg       = S2MPS11_REG_B10CTRL2,                 \
         .vsel_mask      = S2MPS11_BUCK_VSEL_MASK,               \
-        .enable_reg     = S2MPS11_REG_B9CTRL1,                  \
+        .enable_reg     = S2MPS11_REG_B10CTRL1,                 \
         .enable_mask    = S2MPS11_ENABLE_MASK                   \
 }
 
diff --git a/drivers/regulator/tps65217-regulator.c b/drivers/regulator/tps65217-regulator.c
index 73dce7664126..df395187c063 100644
--- a/drivers/regulator/tps65217-regulator.c
+++ b/drivers/regulator/tps65217-regulator.c
@@ -305,8 +305,8 @@ static struct tps65217_board *tps65217_parse_dt(struct platform_device *pdev)
         if (!regs)
                 return NULL;
 
-        count = of_regulator_match(pdev->dev.parent, regs,
-                                reg_matches, TPS65217_NUM_REGULATOR);
+        count = of_regulator_match(&pdev->dev, regs, reg_matches,
+                                   TPS65217_NUM_REGULATOR);
         of_node_put(regs);
         if ((count < 0) || (count > TPS65217_NUM_REGULATOR))
                 return NULL;
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index 59c3770fa77d..b0e4c0bc85c3 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -998,7 +998,7 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
                 return NULL;
         }
 
-        ret = of_regulator_match(pdev->dev.parent, regulators, matches, count);
+        ret = of_regulator_match(&pdev->dev, regulators, matches, count);
         if (ret < 0) {
                 dev_err(&pdev->dev, "Error parsing regulator init data: %d\n",
                         ret);