regulator: Remove max_uV from struct regulator_linear_range
linear ranges means each range has linear voltage settings. So we can calculate max_uV for each linear range in regulator core rather than set the max_uV field in drivers. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
parent
813de3c649
commit
e277e65680
@ -141,18 +141,16 @@ struct pm800_regulators {
|
||||
|
||||
/* Ranges are sorted in ascending order. */
|
||||
static const struct regulator_linear_range buck1_volt_range[] = {
|
||||
{ .min_uV = 600000, .max_uV = 1587500, .min_sel = 0, .max_sel = 0x4f,
|
||||
.uV_step = 12500 },
|
||||
{ .min_uV = 1600000, .max_uV = 1800000, .min_sel = 0x50,
|
||||
.max_sel = 0x54, .uV_step = 50000 },
|
||||
{ .min_uV = 600000, .min_sel = 0, .max_sel = 0x4f, .uV_step = 12500 },
|
||||
{ .min_uV = 1600000, .min_sel = 0x50, .max_sel = 0x54,
|
||||
.uV_step = 50000 },
|
||||
};
|
||||
|
||||
/* BUCK 2~5 have same ranges. */
|
||||
static const struct regulator_linear_range buck2_5_volt_range[] = {
|
||||
{ .min_uV = 600000, .max_uV = 1587500, .min_sel = 0, .max_sel = 0x4f,
|
||||
.uV_step = 12500 },
|
||||
{ .min_uV = 1600000, .max_uV = 3300000, .min_sel = 0x50,
|
||||
.max_sel = 0x72, .uV_step = 50000 },
|
||||
{ .min_uV = 600000, .min_sel = 0, .max_sel = 0x4f, .uV_step = 12500 },
|
||||
{ .min_uV = 1600000, .min_sel = 0x50, .max_sel = 0x72,
|
||||
.uV_step = 50000 },
|
||||
};
|
||||
|
||||
static const unsigned int ldo1_volt_table[] = {
|
||||
|
@ -117,26 +117,23 @@ static struct regulator_ops as3711_dldo_ops = {
|
||||
};
|
||||
|
||||
static const struct regulator_linear_range as3711_sd_ranges[] = {
|
||||
{ .min_uV = 612500, .max_uV = 1400000,
|
||||
.min_sel = 0x1, .max_sel = 0x40, .uV_step = 12500 },
|
||||
{ .min_uV = 1425000, .max_uV = 2600000,
|
||||
.min_sel = 0x41, .max_sel = 0x70, .uV_step = 25000 },
|
||||
{ .min_uV = 2650000, .max_uV = 3350000,
|
||||
.min_sel = 0x71, .max_sel = 0x7f, .uV_step = 50000 },
|
||||
{ .min_uV = 612500, .min_sel = 0x1, .max_sel = 0x40, .uV_step = 12500 },
|
||||
{ .min_uV = 1425000, .min_sel = 0x41, .max_sel = 0x70,
|
||||
.uV_step = 25000 },
|
||||
{ .min_uV = 2650000, .min_sel = 0x71, .max_sel = 0x7f,
|
||||
.uV_step = 50000 },
|
||||
};
|
||||
|
||||
static const struct regulator_linear_range as3711_aldo_ranges[] = {
|
||||
{ .min_uV = 1200000, .max_uV = 1950000,
|
||||
.min_sel = 0, .max_sel = 0xf, .uV_step = 50000 },
|
||||
{ .min_uV = 1800000, .max_uV = 3300000,
|
||||
.min_sel = 0x10, .max_sel = 0x1f, .uV_step = 100000 },
|
||||
{ .min_uV = 1200000, .min_sel = 0, .max_sel = 0xf, .uV_step = 50000 },
|
||||
{ .min_uV = 1800000, .min_sel = 0x10, .max_sel = 0x1f,
|
||||
.uV_step = 100000 },
|
||||
};
|
||||
|
||||
static const struct regulator_linear_range as3711_dldo_ranges[] = {
|
||||
{ .min_uV = 900000, .max_uV = 1700000,
|
||||
.min_sel = 0, .max_sel = 0x10, .uV_step = 50000 },
|
||||
{ .min_uV = 1750000, .max_uV = 3300000,
|
||||
.min_sel = 0x20, .max_sel = 0x3f, .uV_step = 50000 },
|
||||
{ .min_uV = 900000, .min_sel = 0, .max_sel = 0x10, .uV_step = 50000 },
|
||||
{ .min_uV = 1750000, .min_sel = 0x20, .max_sel = 0x3f,
|
||||
.uV_step = 50000 },
|
||||
};
|
||||
|
||||
#define AS3711_REG(_id, _en_reg, _en_bit, _vmask, _vshift, _min_uV, _max_uV, _sfx) \
|
||||
|
@ -441,7 +441,6 @@ static struct regulator_ops as3722_ldo3_extcntrl_ops = {
|
||||
.max_sel = _max_sel, \
|
||||
.uV_step = _step_uV, \
|
||||
.min_uV = _min_uV, \
|
||||
.max_uV = _min_uV + (_max_sel - _min_sel) * _step_uV, \
|
||||
}
|
||||
|
||||
static const struct regulator_linear_range as3722_ldo_ranges[] = {
|
||||
|
@ -253,10 +253,8 @@ static int da9034_set_dvc_voltage_sel(struct regulator_dev *rdev,
|
||||
}
|
||||
|
||||
static const struct regulator_linear_range da9034_ldo12_ranges[] = {
|
||||
{ .min_uV = 1700000, .max_uV = 2050000, .min_sel = 0, .max_sel = 7,
|
||||
.uV_step = 50000 },
|
||||
{ .min_uV = 2700000, .max_uV = 3050000, .min_sel = 8, .max_sel = 15,
|
||||
.uV_step = 50000 },
|
||||
{ .min_uV = 1700000, .min_sel = 0, .max_sel = 7, .uV_step = 50000 },
|
||||
{ .min_uV = 2700000, .min_sel = 8, .max_sel = 15, .uV_step = 50000 },
|
||||
};
|
||||
|
||||
static struct regulator_ops da903x_regulator_ldo_ops = {
|
||||
|
@ -284,9 +284,13 @@ int regulator_map_voltage_linear_range(struct regulator_dev *rdev,
|
||||
}
|
||||
|
||||
for (i = 0; i < rdev->desc->n_linear_ranges; i++) {
|
||||
range = &rdev->desc->linear_ranges[i];
|
||||
int linear_max_uV;
|
||||
|
||||
if (!(min_uV <= range->max_uV && max_uV >= range->min_uV))
|
||||
range = &rdev->desc->linear_ranges[i];
|
||||
linear_max_uV = range->min_uV +
|
||||
(range->max_sel - range->min_sel) * range->uV_step;
|
||||
|
||||
if (!(min_uV <= linear_max_uV && max_uV >= range->min_uV))
|
||||
continue;
|
||||
|
||||
if (min_uV <= range->min_uV)
|
||||
|
@ -52,25 +52,17 @@ static const unsigned int LDO1_VSEL_table[] = {
|
||||
};
|
||||
|
||||
static const struct regulator_linear_range tps65217_uv1_ranges[] = {
|
||||
{ .min_uV = 900000, .max_uV = 1500000, .min_sel = 0, .max_sel = 24,
|
||||
.uV_step = 25000 },
|
||||
{ .min_uV = 1550000, .max_uV = 1800000, .min_sel = 25, .max_sel = 30,
|
||||
.uV_step = 50000 },
|
||||
{ .min_uV = 1850000, .max_uV = 2900000, .min_sel = 31, .max_sel = 52,
|
||||
.uV_step = 50000 },
|
||||
{ .min_uV = 3000000, .max_uV = 3200000, .min_sel = 53, .max_sel = 55,
|
||||
.uV_step = 100000 },
|
||||
{ .min_uV = 3300000, .max_uV = 3300000, .min_sel = 56, .max_sel = 62,
|
||||
.uV_step = 0 },
|
||||
{ .min_uV = 900000, .min_sel = 0, .max_sel = 24, .uV_step = 25000 },
|
||||
{ .min_uV = 1550000, .min_sel = 25, .max_sel = 30, .uV_step = 50000 },
|
||||
{ .min_uV = 1850000, .min_sel = 31, .max_sel = 52, .uV_step = 50000 },
|
||||
{ .min_uV = 3000000, .min_sel = 53, .max_sel = 55, .uV_step = 100000 },
|
||||
{ .min_uV = 3300000, .min_sel = 56, .max_sel = 62, .uV_step = 0 },
|
||||
};
|
||||
|
||||
static const struct regulator_linear_range tps65217_uv2_ranges[] = {
|
||||
{ .min_uV = 1500000, .max_uV = 1900000, .min_sel = 0, .max_sel = 8,
|
||||
.uV_step = 50000 },
|
||||
{ .min_uV = 2000000, .max_uV = 2400000, .min_sel = 9, .max_sel = 13,
|
||||
.uV_step = 100000 },
|
||||
{ .min_uV = 2450000, .max_uV = 3300000, .min_sel = 14, .max_sel = 31,
|
||||
.uV_step = 50000 },
|
||||
{ .min_uV = 1500000, .min_sel = 0, .max_sel = 8, .uV_step = 50000 },
|
||||
{ .min_uV = 2000000, .min_sel = 9, .max_sel = 13, .uV_step = 100000 },
|
||||
{ .min_uV = 2450000, .min_sel = 14, .max_sel = 31, .uV_step = 50000 },
|
||||
};
|
||||
|
||||
static int tps65217_pmic_enable(struct regulator_dev *dev)
|
||||
|
@ -119,12 +119,9 @@ struct tps65912_reg {
|
||||
};
|
||||
|
||||
static const struct regulator_linear_range tps65912_ldo_ranges[] = {
|
||||
{ .min_uV = 800000, .max_uV = 1600000, .min_sel = 0, .max_sel = 32,
|
||||
.uV_step = 25000 },
|
||||
{ .min_uV = 1650000, .max_uV = 3000000, .min_sel = 33, .max_sel = 60,
|
||||
.uV_step = 50000 },
|
||||
{ .min_uV = 3100000, .max_uV = 3300000, .min_sel = 61, .max_sel = 63,
|
||||
.uV_step = 100000 },
|
||||
{ .min_uV = 800000, .min_sel = 0, .max_sel = 32, .uV_step = 25000 },
|
||||
{ .min_uV = 1650000, .min_sel = 33, .max_sel = 60, .uV_step = 50000 },
|
||||
{ .min_uV = 3100000, .min_sel = 61, .max_sel = 63, .uV_step = 100000 },
|
||||
};
|
||||
|
||||
static int tps65912_get_range(struct tps65912_reg *pmic, int id)
|
||||
|
@ -63,10 +63,8 @@ static irqreturn_t wm831x_ldo_uv_irq(int irq, void *data)
|
||||
*/
|
||||
|
||||
static const struct regulator_linear_range wm831x_gp_ldo_ranges[] = {
|
||||
{ .min_uV = 900000, .max_uV = 1600000, .min_sel = 0, .max_sel = 14,
|
||||
.uV_step = 50000 },
|
||||
{ .min_uV = 1700000, .max_uV = 3300000, .min_sel = 15, .max_sel = 31,
|
||||
.uV_step = 100000 },
|
||||
{ .min_uV = 900000, .min_sel = 0, .max_sel = 14, .uV_step = 50000 },
|
||||
{ .min_uV = 1700000, .min_sel = 15, .max_sel = 31, .uV_step = 100000 },
|
||||
};
|
||||
|
||||
static int wm831x_gp_ldo_set_suspend_voltage(struct regulator_dev *rdev,
|
||||
@ -332,10 +330,8 @@ static struct platform_driver wm831x_gp_ldo_driver = {
|
||||
*/
|
||||
|
||||
static const struct regulator_linear_range wm831x_aldo_ranges[] = {
|
||||
{ .min_uV = 1000000, .max_uV = 1600000, .min_sel = 0, .max_sel = 12,
|
||||
.uV_step = 50000 },
|
||||
{ .min_uV = 1700000, .max_uV = 3500000, .min_sel = 13, .max_sel = 31,
|
||||
.uV_step = 100000 },
|
||||
{ .min_uV = 1000000, .min_sel = 0, .max_sel = 12, .uV_step = 50000 },
|
||||
{ .min_uV = 1700000, .min_sel = 13, .max_sel = 31, .uV_step = 100000 },
|
||||
};
|
||||
|
||||
static int wm831x_aldo_set_suspend_voltage(struct regulator_dev *rdev,
|
||||
|
@ -543,10 +543,8 @@ static int wm8350_dcdc_set_suspend_mode(struct regulator_dev *rdev,
|
||||
}
|
||||
|
||||
static const struct regulator_linear_range wm8350_ldo_ranges[] = {
|
||||
{ .min_uV = 900000, .max_uV = 1650000, .min_sel = 0, .max_sel = 15,
|
||||
.uV_step = 50000 },
|
||||
{ .min_uV = 1800000, .max_uV = 3300000, .min_sel = 16, .max_sel = 31,
|
||||
.uV_step = 100000 },
|
||||
{ .min_uV = 900000, .min_sel = 0, .max_sel = 15, .uV_step = 50000 },
|
||||
{ .min_uV = 1800000, .min_sel = 16, .max_sel = 31, .uV_step = 100000 },
|
||||
};
|
||||
|
||||
static int wm8350_ldo_set_suspend_voltage(struct regulator_dev *rdev, int uV)
|
||||
|
@ -20,10 +20,8 @@
|
||||
#include <linux/mfd/wm8400-private.h>
|
||||
|
||||
static const struct regulator_linear_range wm8400_ldo_ranges[] = {
|
||||
{ .min_uV = 900000, .max_uV = 1600000, .min_sel = 0, .max_sel = 14,
|
||||
.uV_step = 50000 },
|
||||
{ .min_uV = 1700000, .max_uV = 3300000, .min_sel = 15, .max_sel = 31,
|
||||
.uV_step = 100000 },
|
||||
{ .min_uV = 900000, .min_sel = 0, .max_sel = 14, .uV_step = 50000 },
|
||||
{ .min_uV = 1700000, .min_sel = 15, .max_sel = 31, .uV_step = 100000 },
|
||||
};
|
||||
|
||||
static struct regulator_ops wm8400_ldo_ops = {
|
||||
|
@ -46,14 +46,12 @@ enum regulator_status {
|
||||
* regulator_list_linear_range().
|
||||
*
|
||||
* @min_uV: Lowest voltage in range
|
||||
* @max_uV: Highest voltage in range
|
||||
* @min_sel: Lowest selector for range
|
||||
* @max_sel: Highest selector for range
|
||||
* @uV_step: Step size
|
||||
*/
|
||||
struct regulator_linear_range {
|
||||
unsigned int min_uV;
|
||||
unsigned int max_uV;
|
||||
unsigned int min_sel;
|
||||
unsigned int max_sel;
|
||||
unsigned int uV_step;
|
||||
|
Loading…
Reference in New Issue
Block a user