11 files changed, 69 insertions, 64 deletions

diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index 0199eeea63b1..8f39cac661d2 100644
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -188,7 +188,7 @@ static int anatop_regulator_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id __devinitdata of_anatop_regulator_match_tbl[] = {
+static struct of_device_id of_anatop_regulator_match_tbl[] = {
         { .compatible = "fsl,anatop-regulator", },
         { /* end */ }
 };
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 0f65b246cc0c..278584302f2d 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1885,9 +1885,15 @@ int regulator_can_change_voltage(struct regulator *regulator)
         struct regulator_dev    *rdev = regulator->rdev;
 
         if (rdev->constraints &&
-            rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE &&
-            (rdev->desc->n_voltages - rdev->desc->linear_min_sel) > 1)
-                return 1;
+            (rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE)) {
+                if (rdev->desc->n_voltages - rdev->desc->linear_min_sel > 1)
+                        return 1;
+
+                if (rdev->desc->continuous_voltage_range &&
+                    rdev->constraints->min_uV && rdev->constraints->max_uV &&
+                    rdev->constraints->min_uV != rdev->constraints->max_uV)
+                        return 1;
+        }
 
         return 0;
 }
@@ -3315,7 +3321,8 @@ static void rdev_init_debugfs(struct regulator_dev *rdev)
  * @config: runtime configuration for regulator
  *
  * Called by regulator drivers to register a regulator.
- * Returns 0 on success.
+ * Returns a valid pointer to struct regulator_dev on success
+ * or an ERR_PTR() on error.
  */
 struct regulator_dev *
 regulator_register(const struct regulator_desc *regulator_desc,
diff --git a/drivers/regulator/da9055-regulator.c b/drivers/regulator/da9055-regulator.c
index a4b9cb8c4317..1a05ac66878f 100644
--- a/drivers/regulator/da9055-regulator.c
+++ b/drivers/regulator/da9055-regulator.c
@@ -442,9 +442,9 @@ static struct da9055_regulator_info da9055_regulator_info[] = {
  * GPIO can control regulator state and/or select the regulator register
  * set A/B for voltage ramping.
  */
-static __devinit int da9055_gpio_init(struct da9055_regulator *regulator,
-                                      struct regulator_config *config,
-                                      struct da9055_pdata *pdata, int id)
+static int da9055_gpio_init(struct da9055_regulator *regulator,
+                            struct regulator_config *config,
+                            struct da9055_pdata *pdata, int id)
 {
         struct da9055_regulator_info *info = regulator->info;
         int ret = 0;
@@ -533,7 +533,7 @@ static inline struct da9055_regulator_info *find_regulator_info(int id)
         return NULL;
 }
 
-static int __devinit da9055_regulator_probe(struct platform_device *pdev)
+static int da9055_regulator_probe(struct platform_device *pdev)
 {
         struct regulator_config config = { };
         struct da9055_regulator *regulator;
@@ -605,7 +605,7 @@ err_regulator:
         return ret;
 }
 
-static int __devexit da9055_regulator_remove(struct platform_device *pdev)
+static int da9055_regulator_remove(struct platform_device *pdev)
 {
         struct da9055_regulator *regulator = platform_get_drvdata(pdev);
 
@@ -616,7 +616,7 @@ static int __devexit da9055_regulator_remove(struct platform_device *pdev)
 
 static struct platform_driver da9055_regulator_driver = {
         .probe = da9055_regulator_probe,
-        .remove = __devexit_p(da9055_regulator_remove),
+        .remove = da9055_regulator_remove,
         .driver = {
                 .name = "da9055-regulator",
                 .owner = THIS_MODULE,
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index 48d5b7608b00..e5c03b534fae 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -246,7 +246,7 @@ static int reg_fixed_voltage_remove(struct platform_device *pdev)
 }
 
 #if defined(CONFIG_OF)
-static const struct of_device_id fixed_of_match[] __devinitconst = {
+static const struct of_device_id fixed_of_match[] = {
         { .compatible = "regulator-fixed", },
         {},
 };
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c
index 8ae288fc150b..bae681ccd3ea 100644
--- a/drivers/regulator/gpio-regulator.c
+++ b/drivers/regulator/gpio-regulator.c
@@ -365,7 +365,7 @@ static int gpio_regulator_remove(struct platform_device *pdev)
 }
 
 #if defined(CONFIG_OF)
-static const struct of_device_id regulator_gpio_of_match[] __devinitconst = {
+static const struct of_device_id regulator_gpio_of_match[] = {
         { .compatible = "regulator-gpio", },
         {},
 };
diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
index 3ee26387b121..9a8ea9163005 100644
--- a/drivers/regulator/max8973-regulator.c
+++ b/drivers/regulator/max8973-regulator.c
@@ -248,8 +248,8 @@ static struct regulator_ops max8973_dcdc_ops = {
         .get_mode               = max8973_dcdc_get_mode,
 };
 
-static int __devinit max8973_init_dcdc(struct max8973_chip *max,
-                struct max8973_regulator_platform_data *pdata)
+static int max8973_init_dcdc(struct max8973_chip *max,
+                             struct max8973_regulator_platform_data *pdata)
 {
         int ret;
         uint8_t control1 = 0;
@@ -359,8 +359,8 @@ static const struct regmap_config max8973_regmap_config = {
         .cache_type             = REGCACHE_RBTREE,
 };
 
-static int __devinit max8973_probe(struct i2c_client *client,
-                                     const struct i2c_device_id *id)
+static int max8973_probe(struct i2c_client *client,
+                         const struct i2c_device_id *id)
 {
         struct max8973_regulator_platform_data *pdata;
         struct regulator_config config = { };
@@ -463,7 +463,7 @@ static int __devinit max8973_probe(struct i2c_client *client,
         return 0;
 }
 
-static int __devexit max8973_remove(struct i2c_client *client)
+static int max8973_remove(struct i2c_client *client)
 {
         struct max8973_chip *max = i2c_get_clientdata(client);
 
@@ -484,7 +484,7 @@ static struct i2c_driver max8973_i2c_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = max8973_probe,
-        .remove = __devexit_p(max8973_remove),
+        .remove = max8973_remove,
         .id_table = max8973_id,
 };
 
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index df0eafb0dc7e..02be7fcae32f 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -71,26 +71,26 @@ struct voltage_map_desc {
         int step;
 };
 
-/* Voltage maps in mV */
+/* Voltage maps in uV */
 static const struct voltage_map_desc ldo_voltage_map_desc = {
-        .min = 800,     .max = 3950,    .step = 50,
+        .min = 800000,  .max = 3950000, .step = 50000,
 }; /* LDO1 ~ 18, 21 all */
 
 static const struct voltage_map_desc buck1245_voltage_map_desc = {
-        .min = 650,     .max = 2225,    .step = 25,
+        .min = 650000,  .max = 2225000, .step = 25000,
 }; /* Buck1, 2, 4, 5 */
 
 static const struct voltage_map_desc buck37_voltage_map_desc = {
-        .min = 750,     .max = 3900,    .step = 50,
+        .min = 750000,  .max = 3900000, .step = 50000,
 }; /* Buck3, 7 */
 
-/* current map in mA */
+/* current map in uA */
 static const struct voltage_map_desc charger_current_map_desc = {
-        .min = 200,     .max = 950,     .step = 50,
+        .min = 200000,  .max = 950000,  .step = 50000,
 };
 
 static const struct voltage_map_desc topoff_current_map_desc = {
-        .min = 50,      .max = 200,     .step = 10,
+        .min = 50000,   .max = 200000,  .step = 10000,
 };
 
 static const struct voltage_map_desc *reg_voltage_map[] = {
@@ -194,7 +194,7 @@ static int max8997_list_voltage(struct regulator_dev *rdev,
         if (val > desc->max)
                 return -EINVAL;
 
-        return val * 1000;
+        return val;
 }
 
 static int max8997_get_enable_register(struct regulator_dev *rdev,
@@ -485,7 +485,6 @@ static int max8997_set_voltage_ldobuck(struct regulator_dev *rdev,
 {
         struct max8997_data *max8997 = rdev_get_drvdata(rdev);
         struct i2c_client *i2c = max8997->iodev->i2c;
-        int min_vol = min_uV / 1000, max_vol = max_uV / 1000;
         const struct voltage_map_desc *desc;
         int rid = rdev_get_id(rdev);
         int i, reg, shift, mask, ret;
@@ -509,7 +508,7 @@ static int max8997_set_voltage_ldobuck(struct regulator_dev *rdev,
 
         desc = reg_voltage_map[rid];
 
-        i = max8997_get_voltage_proper_val(desc, min_vol, max_vol);
+        i = max8997_get_voltage_proper_val(desc, min_uV, max_uV);
         if (i < 0)
                 return i;
 
@@ -557,7 +556,7 @@ static int max8997_set_voltage_ldobuck_time_sel(struct regulator_dev *rdev,
         case MAX8997_BUCK4:
         case MAX8997_BUCK5:
                 return DIV_ROUND_UP(desc->step * (new_selector - old_selector),
-                                    max8997->ramp_delay);
+                                    max8997->ramp_delay * 1000);
         }
 
         return 0;
@@ -656,7 +655,6 @@ static int max8997_set_voltage_buck(struct regulator_dev *rdev,
         const struct voltage_map_desc *desc;
         int new_val, new_idx, damage, tmp_val, tmp_idx, tmp_dmg;
         bool gpio_dvs_mode = false;
-        int min_vol = min_uV / 1000, max_vol = max_uV / 1000;
 
         if (rid < MAX8997_BUCK1 || rid > MAX8997_BUCK7)
                 return -EINVAL;
@@ -681,7 +679,7 @@ static int max8997_set_voltage_buck(struct regulator_dev *rdev,
                                                 selector);
 
         desc = reg_voltage_map[rid];
-        new_val = max8997_get_voltage_proper_val(desc, min_vol, max_vol);
+        new_val = max8997_get_voltage_proper_val(desc, min_uV, max_uV);
         if (new_val < 0)
                 return new_val;
 
@@ -1123,8 +1121,8 @@ static int max8997_pmic_probe(struct platform_device *pdev)
                 max8997->buck1_vol[i] = ret =
                         max8997_get_voltage_proper_val(
                                         &buck1245_voltage_map_desc,
-                                        pdata->buck1_voltage[i] / 1000,
-                                        pdata->buck1_voltage[i] / 1000 +
+                                        pdata->buck1_voltage[i],
+                                        pdata->buck1_voltage[i] +
                                         buck1245_voltage_map_desc.step);
                 if (ret < 0)
                         goto err_out;
@@ -1132,8 +1130,8 @@ static int max8997_pmic_probe(struct platform_device *pdev)
                 max8997->buck2_vol[i] = ret =
                         max8997_get_voltage_proper_val(
                                         &buck1245_voltage_map_desc,
-                                        pdata->buck2_voltage[i] / 1000,
-                                        pdata->buck2_voltage[i] / 1000 +
+                                        pdata->buck2_voltage[i],
+                                        pdata->buck2_voltage[i] +
                                         buck1245_voltage_map_desc.step);
                 if (ret < 0)
                         goto err_out;
@@ -1141,8 +1139,8 @@ static int max8997_pmic_probe(struct platform_device *pdev)
                 max8997->buck5_vol[i] = ret =
                         max8997_get_voltage_proper_val(
                                         &buck1245_voltage_map_desc,
-                                        pdata->buck5_voltage[i] / 1000,
-                                        pdata->buck5_voltage[i] / 1000 +
+                                        pdata->buck5_voltage[i],
+                                        pdata->buck5_voltage[i] +
                                         buck1245_voltage_map_desc.step);
                 if (ret < 0)
                         goto err_out;
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c
index b821d08eb64a..1f0df4046b86 100644
--- a/drivers/regulator/max8998.c
+++ b/drivers/regulator/max8998.c
@@ -51,39 +51,39 @@ struct voltage_map_desc {
         int step;
 };
 
-/* Voltage maps */
+/* Voltage maps in uV*/
 static const struct voltage_map_desc ldo23_voltage_map_desc = {
-        .min = 800,     .step = 50,     .max = 1300,
+        .min = 800000,  .step = 50000,  .max = 1300000,
 };
 static const struct voltage_map_desc ldo456711_voltage_map_desc = {
-        .min = 1600,    .step = 100,    .max = 3600,
+        .min = 1600000, .step = 100000, .max = 3600000,
 };
 static const struct voltage_map_desc ldo8_voltage_map_desc = {
-        .min = 3000,    .step = 100,    .max = 3600,
+        .min = 3000000, .step = 100000, .max = 3600000,
 };
 static const struct voltage_map_desc ldo9_voltage_map_desc = {
-        .min = 2800,    .step = 100,    .max = 3100,
+        .min = 2800000, .step = 100000, .max = 3100000,
 };
 static const struct voltage_map_desc ldo10_voltage_map_desc = {
-        .min = 950,     .step = 50,     .max = 1300,
+        .min = 95000,   .step = 50000,  .max = 1300000,
 };
 static const struct voltage_map_desc ldo1213_voltage_map_desc = {
-        .min = 800,     .step = 100,    .max = 3300,
+        .min = 800000,  .step = 100000, .max = 3300000,
 };
 static const struct voltage_map_desc ldo1415_voltage_map_desc = {
-        .min = 1200,    .step = 100,    .max = 3300,
+        .min = 1200000, .step = 100000, .max = 3300000,
 };
 static const struct voltage_map_desc ldo1617_voltage_map_desc = {
-        .min = 1600,    .step = 100,    .max = 3600,
+        .min = 1600000, .step = 100000, .max = 3600000,
 };
 static const struct voltage_map_desc buck12_voltage_map_desc = {
-        .min = 750,     .step = 25,     .max = 1525,
+        .min = 750000,  .step = 25000,  .max = 1525000,
 };
 static const struct voltage_map_desc buck3_voltage_map_desc = {
-        .min = 1600,    .step = 100,    .max = 3600,
+        .min = 1600000, .step = 100000, .max = 3600000,
 };
 static const struct voltage_map_desc buck4_voltage_map_desc = {
-        .min = 800,     .step = 100,    .max = 2300,
+        .min = 800000,  .step = 100000, .max = 2300000,
 };
 
 static const struct voltage_map_desc *ldo_voltage_map[] = {
@@ -445,9 +445,9 @@ static int max8998_set_voltage_buck_time_sel(struct regulator_dev *rdev,
         if (max8998->iodev->type == TYPE_MAX8998 && !(val & MAX8998_ENRAMP))
                 return 0;
 
-        difference = (new_selector - old_selector) * desc->step;
+        difference = (new_selector - old_selector) * desc->step / 1000;
         if (difference > 0)
-                return difference / ((val & 0x0f) + 1);
+                return DIV_ROUND_UP(difference, (val & 0x0f) + 1);
 
         return 0;
 }
@@ -702,7 +702,7 @@ static int max8998_pmic_probe(struct platform_device *pdev)
                 i = 0;
                 while (buck12_voltage_map_desc.min +
                        buck12_voltage_map_desc.step*i
-                       < (pdata->buck1_voltage1 / 1000))
+                       < pdata->buck1_voltage1)
                         i++;
                 max8998->buck1_vol[0] = i;
                 ret = max8998_write_reg(i2c, MAX8998_REG_BUCK1_VOLTAGE1, i);
@@ -713,7 +713,7 @@ static int max8998_pmic_probe(struct platform_device *pdev)
                 i = 0;
                 while (buck12_voltage_map_desc.min +
                        buck12_voltage_map_desc.step*i
-                       < (pdata->buck1_voltage2 / 1000))
+                       < pdata->buck1_voltage2)
                         i++;
 
                 max8998->buck1_vol[1] = i;
@@ -725,7 +725,7 @@ static int max8998_pmic_probe(struct platform_device *pdev)
                 i = 0;
                 while (buck12_voltage_map_desc.min +
                        buck12_voltage_map_desc.step*i
-                       < (pdata->buck1_voltage3 / 1000))
+                       < pdata->buck1_voltage3)
                         i++;
 
                 max8998->buck1_vol[2] = i;
@@ -737,7 +737,7 @@ static int max8998_pmic_probe(struct platform_device *pdev)
                 i = 0;
                 while (buck12_voltage_map_desc.min +
                        buck12_voltage_map_desc.step*i
-                       < (pdata->buck1_voltage4 / 1000))
+                       < pdata->buck1_voltage4)
                         i++;
 
                 max8998->buck1_vol[3] = i;
@@ -763,7 +763,7 @@ static int max8998_pmic_probe(struct platform_device *pdev)
                 i = 0;
                 while (buck12_voltage_map_desc.min +
                        buck12_voltage_map_desc.step*i
-                       < (pdata->buck2_voltage1 / 1000))
+                       < pdata->buck2_voltage1)
                         i++;
                 max8998->buck2_vol[0] = i;
                 ret = max8998_write_reg(i2c, MAX8998_REG_BUCK2_VOLTAGE1, i);
@@ -774,7 +774,7 @@ static int max8998_pmic_probe(struct platform_device *pdev)
                 i = 0;
                 while (buck12_voltage_map_desc.min +
                        buck12_voltage_map_desc.step*i
-                       < (pdata->buck2_voltage2 / 1000))
+                       < pdata->buck2_voltage2)
                         i++;
                 max8998->buck2_vol[1] = i;
                 ret = max8998_write_reg(i2c, MAX8998_REG_BUCK2_VOLTAGE2, i);
@@ -792,8 +792,8 @@ static int max8998_pmic_probe(struct platform_device *pdev)
                         int count = (desc->max - desc->min) / desc->step + 1;
 
                         regulators[index].n_voltages = count;
-                        regulators[index].min_uV = desc->min * 1000;
-                        regulators[index].uV_step = desc->step * 1000;
+                        regulators[index].min_uV = desc->min;
+                        regulators[index].uV_step = desc->step;
                 }
 
                 config.dev = max8998->dev;
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index e915629a25cf..c9e912f583bc 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -806,7 +806,7 @@ static int palmas_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct of_device_id __devinitdata of_palmas_match_tbl[] = {
+static struct of_device_id of_palmas_match_tbl[] = {
         { .compatible = "ti,palmas-pmic", },
         { /* end */ }
 };
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 9f991f2c525a..33b65c9ad5d5 100644
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -214,7 +214,7 @@ static int s5m8767_reg_is_enabled(struct regulator_dev *rdev)
         struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev);
         int ret, reg;
         int mask = 0xc0, enable_ctrl;
-        u8 val;
+        unsigned int val;
 
         ret = s5m8767_get_register(rdev, &reg, &enable_ctrl);
         if (ret == -EINVAL)
@@ -306,7 +306,7 @@ static int s5m8767_get_voltage_sel(struct regulator_dev *rdev)
         struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev);
         int reg, mask, ret;
         int reg_id = rdev_get_id(rdev);
-        u8 val;
+        unsigned int val;
 
         ret = s5m8767_get_voltage_register(rdev, &reg);
         if (ret)
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 493c8c6a241f..74508cc62d67 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -1064,7 +1064,7 @@ static u8 twl_get_smps_mult(void)
 #define TWLFIXED_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLFIXED, label)
 #define TWLSMPS_OF_MATCH(comp, label) TWL_OF_MATCH(comp, TWLSMPS, label)
 
-static const struct of_device_id twl_of_match[] __devinitconst = {
+static const struct of_device_id twl_of_match[] = {
         TWL4030_OF_MATCH("ti,twl4030-vaux1", VAUX1),
         TWL4030_OF_MATCH("ti,twl4030-vaux2", VAUX2_4030),
         TWL4030_OF_MATCH("ti,twl5030-vaux2", VAUX2),