Merge tag 'hwmon-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...

[sfrench/cifs-2.6.git] / drivers / regulator / wm831x-dcdc.c

diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index 5a5bc4bb08d26ee78926aacaa906010cc1f426c2..12b422373580c394b0d978763763150fcccd724d 100644 (file)
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -205,33 +205,10 @@ static irqreturn_t wm831x_dcdc_oc_irq(int irq, void *data)
  * BUCKV specifics
  */
 
-static int wm831x_buckv_list_voltage(struct regulator_dev *rdev,
-                                     unsigned selector)
-{
-       if (selector <= 0x8)
-               return 600000;
-       if (selector <= WM831X_BUCKV_MAX_SELECTOR)
-               return 600000 + ((selector - 0x8) * 12500);
-       return -EINVAL;
-}
-
-static int wm831x_buckv_map_voltage(struct regulator_dev *rdev,
-                                  int min_uV, int max_uV)
-{
-       u16 vsel;
-
-       if (min_uV < 600000)
-               vsel = 0;
-       else if (min_uV <= 1800000)
-               vsel = DIV_ROUND_UP(min_uV - 600000, 12500) + 8;
-       else
-               return -EINVAL;
-
-       if (wm831x_buckv_list_voltage(rdev, vsel) > max_uV)
-               return -EINVAL;
-
-       return vsel;
-}
+static const struct regulator_linear_range wm831x_buckv_ranges[] = {
+       REGULATOR_LINEAR_RANGE(600000, 0, 0x7, 0),
+       REGULATOR_LINEAR_RANGE(600000, 0x8, 0x68, 12500),
+};
 
 static int wm831x_buckv_set_dvs(struct regulator_dev *rdev, int state)
 {
@@ -309,7 +286,7 @@ static int wm831x_buckv_set_suspend_voltage(struct regulator_dev *rdev,
        u16 reg = dcdc->base + WM831X_DCDC_SLEEP_CONTROL;
        int vsel;
 
-       vsel = wm831x_buckv_map_voltage(rdev, uV, uV);
+       vsel = regulator_map_voltage_linear_range(rdev, uV, uV);
        if (vsel < 0)
                return vsel;
 
@@ -327,52 +304,18 @@ static int wm831x_buckv_get_voltage_sel(struct regulator_dev *rdev)
 }
 
 /* Current limit options */
-static u16 wm831x_dcdc_ilim[] = {
-       125, 250, 375, 500, 625, 750, 875, 1000
+static const unsigned int wm831x_dcdc_ilim[] = {
+       125000, 250000, 375000, 500000, 625000, 750000, 875000, 1000000
 };
 
-static int wm831x_buckv_set_current_limit(struct regulator_dev *rdev,
-                                          int min_uA, int max_uA)
-{
-       struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
-       struct wm831x *wm831x = dcdc->wm831x;
-       u16 reg = dcdc->base + WM831X_DCDC_CONTROL_2;
-       int i;
-
-       for (i = ARRAY_SIZE(wm831x_dcdc_ilim) - 1; i >= 0; i--) {
-               if ((min_uA <= wm831x_dcdc_ilim[i]) &&
-                   (wm831x_dcdc_ilim[i] <= max_uA))
-                       return wm831x_set_bits(wm831x, reg,
-                                              WM831X_DC1_HC_THR_MASK,
-                                               i << WM831X_DC1_HC_THR_SHIFT);
-       }
-
-       return -EINVAL;
-}
-
-static int wm831x_buckv_get_current_limit(struct regulator_dev *rdev)
-{
-       struct wm831x_dcdc *dcdc = rdev_get_drvdata(rdev);
-       struct wm831x *wm831x = dcdc->wm831x;
-       u16 reg = dcdc->base + WM831X_DCDC_CONTROL_2;
-       int val;
-
-       val = wm831x_reg_read(wm831x, reg);
-       if (val < 0)
-               return val;
-
-       val = (val & WM831X_DC1_HC_THR_MASK) >> WM831X_DC1_HC_THR_SHIFT;
-       return wm831x_dcdc_ilim[val];
-}
-
 static const struct regulator_ops wm831x_buckv_ops = {
        .set_voltage_sel = wm831x_buckv_set_voltage_sel,
        .get_voltage_sel = wm831x_buckv_get_voltage_sel,
-       .list_voltage = wm831x_buckv_list_voltage,
-       .map_voltage = wm831x_buckv_map_voltage,
+       .list_voltage = regulator_list_voltage_linear_range,
+       .map_voltage = regulator_map_voltage_linear_range,
        .set_suspend_voltage = wm831x_buckv_set_suspend_voltage,
-       .set_current_limit = wm831x_buckv_set_current_limit,
-       .get_current_limit = wm831x_buckv_get_current_limit,
+       .set_current_limit = regulator_set_current_limit_regmap,
+       .get_current_limit = regulator_get_current_limit_regmap,
 
        .is_enabled = regulator_is_enabled_regmap,
        .enable = regulator_enable_regmap,
@@ -492,10 +435,16 @@ static int wm831x_buckv_probe(struct platform_device *pdev)
        dcdc->desc.id = id;
        dcdc->desc.type = REGULATOR_VOLTAGE;
        dcdc->desc.n_voltages = WM831X_BUCKV_MAX_SELECTOR + 1;
+       dcdc->desc.linear_ranges = wm831x_buckv_ranges;
+       dcdc->desc.n_linear_ranges = ARRAY_SIZE(wm831x_buckv_ranges);
        dcdc->desc.ops = &wm831x_buckv_ops;
        dcdc->desc.owner = THIS_MODULE;
        dcdc->desc.enable_reg = WM831X_DCDC_ENABLE;
        dcdc->desc.enable_mask = 1 << id;
+       dcdc->desc.csel_reg = dcdc->base + WM831X_DCDC_CONTROL_2;
+       dcdc->desc.csel_mask = WM831X_DC1_HC_THR_MASK;
+       dcdc->desc.n_current_limits = ARRAY_SIZE(wm831x_dcdc_ilim);
+       dcdc->desc.curr_table = wm831x_dcdc_ilim;
 
        ret = wm831x_reg_read(wm831x, dcdc->base + WM831X_DCDC_ON_CONFIG);
        if (ret < 0) {