Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / regulator / wm8350-regulator.c

diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c
index 7f0fa22ef2aab4e85e71693358737ee099b537e2..835b5f0f344ed2537115b1ed486d14860f88434e 100644 (file)
--- a/drivers/regulator/wm8350-regulator.c
+++ b/drivers/regulator/wm8350-regulator.c
@@ -542,41 +542,12 @@ static int wm8350_dcdc_set_suspend_mode(struct regulator_dev *rdev,
        return 0;
 }
 
-static int wm8350_ldo_list_voltage(struct regulator_dev *rdev,
-                                   unsigned selector)
-{
-       if (selector > WM8350_LDO1_VSEL_MASK)
-               return -EINVAL;
-
-       if (selector < 16)
-               return (selector * 50000) + 900000;
-       else
-               return ((selector - 16) * 100000) + 1800000;
-}
-
-static int wm8350_ldo_map_voltage(struct regulator_dev *rdev, int min_uV,
-                                 int max_uV)
-{
-       int volt, sel;
-       int min_mV = min_uV / 1000;
-       int max_mV = max_uV / 1000;
-
-       if (min_mV < 900 || min_mV > 3300)
-               return -EINVAL;
-       if (max_mV < 900 || max_mV > 3300)
-               return -EINVAL;
-
-       if (min_mV < 1800) /* step size is 50mV < 1800mV */
-               sel = DIV_ROUND_UP(min_uV - 900, 50);
-       else /* step size is 100mV > 1800mV */
-               sel = DIV_ROUND_UP(min_uV - 1800, 100) + 16;
-
-       volt = wm8350_ldo_list_voltage(rdev, sel);
-       if (volt < min_uV || volt > max_uV)
-               return -EINVAL;
-
-       return sel;
-}
+static const struct regulator_linear_range wm8350_ldo_ranges[] = {
+       { .min_uV =  900000, .max_uV = 1750000, .min_sel =  0, .max_sel = 15,
+         .uV_step =  50000 },
+       { .min_uV = 1800000, .max_uV = 3300000, .min_sel = 16, .max_sel = 31,
+         .uV_step = 100000 },
+};
 
 static int wm8350_ldo_set_suspend_voltage(struct regulator_dev *rdev, int uV)
 {
@@ -603,7 +574,7 @@ static int wm8350_ldo_set_suspend_voltage(struct regulator_dev *rdev, int uV)
                return -EINVAL;
        }
 
-       sel = wm8350_ldo_map_voltage(rdev, uV, uV);
+       sel = regulator_map_voltage_linear_range(rdev, uV, uV);
        if (sel < 0)
                return -EINVAL;
 
@@ -998,10 +969,10 @@ static struct regulator_ops wm8350_dcdc2_5_ops = {
 };
 
 static struct regulator_ops wm8350_ldo_ops = {
-       .map_voltage = wm8350_ldo_map_voltage,
+       .map_voltage = regulator_map_voltage_linear_range,
        .set_voltage_sel = regulator_set_voltage_sel_regmap,
        .get_voltage_sel = regulator_get_voltage_sel_regmap,
-       .list_voltage = wm8350_ldo_list_voltage,
+       .list_voltage = regulator_list_voltage_linear_range,
        .enable = regulator_enable_regmap,
        .disable = regulator_disable_regmap,
        .is_enabled = regulator_is_enabled_regmap,
@@ -1108,6 +1079,8 @@ static const struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = {
                .irq = WM8350_IRQ_UV_LDO1,
                .type = REGULATOR_VOLTAGE,
                .n_voltages = WM8350_LDO1_VSEL_MASK + 1,
+               .linear_ranges = wm8350_ldo_ranges,
+               .n_linear_ranges = ARRAY_SIZE(wm8350_ldo_ranges),
                .vsel_reg = WM8350_LDO1_CONTROL,
                .vsel_mask = WM8350_LDO1_VSEL_MASK,
                .enable_reg = WM8350_DCDC_LDO_REQUESTED,
@@ -1121,6 +1094,8 @@ static const struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = {
                .irq = WM8350_IRQ_UV_LDO2,
                .type = REGULATOR_VOLTAGE,
                .n_voltages = WM8350_LDO2_VSEL_MASK + 1,
+               .linear_ranges = wm8350_ldo_ranges,
+               .n_linear_ranges = ARRAY_SIZE(wm8350_ldo_ranges),
                .vsel_reg = WM8350_LDO2_CONTROL,
                .vsel_mask = WM8350_LDO2_VSEL_MASK,
                .enable_reg = WM8350_DCDC_LDO_REQUESTED,
@@ -1134,6 +1109,8 @@ static const struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = {
                .irq = WM8350_IRQ_UV_LDO3,
                .type = REGULATOR_VOLTAGE,
                .n_voltages = WM8350_LDO3_VSEL_MASK + 1,
+               .linear_ranges = wm8350_ldo_ranges,
+               .n_linear_ranges = ARRAY_SIZE(wm8350_ldo_ranges),
                .vsel_reg = WM8350_LDO3_CONTROL,
                .vsel_mask = WM8350_LDO3_VSEL_MASK,
                .enable_reg = WM8350_DCDC_LDO_REQUESTED,
@@ -1147,6 +1124,8 @@ static const struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = {
                .irq = WM8350_IRQ_UV_LDO4,
                .type = REGULATOR_VOLTAGE,
                .n_voltages = WM8350_LDO4_VSEL_MASK + 1,
+               .linear_ranges = wm8350_ldo_ranges,
+               .n_linear_ranges = ARRAY_SIZE(wm8350_ldo_ranges),
                .vsel_reg = WM8350_LDO4_CONTROL,
                .vsel_mask = WM8350_LDO4_VSEL_MASK,
                .enable_reg = WM8350_DCDC_LDO_REQUESTED,
@@ -1222,7 +1201,7 @@ static int wm8350_regulator_probe(struct platform_device *pdev)
        }
 
        config.dev = &pdev->dev;
-       config.init_data = pdev->dev.platform_data;
+       config.init_data = dev_get_platdata(&pdev->dev);
        config.driver_data = dev_get_drvdata(&pdev->dev);
        config.regmap = wm8350->regmap;