regulator: aat2870: Convert to regulator_list_voltage_table
Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
e76b9cc7b8
commit
4506c6d5ea
|
@ -33,8 +33,6 @@ struct aat2870_regulator {
|
|||
struct aat2870_data *aat2870;
|
||||
struct regulator_desc desc;
|
||||
|
||||
const int *voltages; /* uV */
|
||||
|
||||
int min_uV;
|
||||
int max_uV;
|
||||
|
||||
|
@ -47,14 +45,6 @@ struct aat2870_regulator {
|
|||
u8 voltage_mask;
|
||||
};
|
||||
|
||||
static int aat2870_ldo_list_voltage(struct regulator_dev *rdev,
|
||||
unsigned selector)
|
||||
{
|
||||
struct aat2870_regulator *ri = rdev_get_drvdata(rdev);
|
||||
|
||||
return ri->voltages[selector];
|
||||
}
|
||||
|
||||
static int aat2870_ldo_set_voltage_sel(struct regulator_dev *rdev,
|
||||
unsigned selector)
|
||||
{
|
||||
|
@ -111,7 +101,7 @@ static int aat2870_ldo_is_enabled(struct regulator_dev *rdev)
|
|||
}
|
||||
|
||||
static struct regulator_ops aat2870_ldo_ops = {
|
||||
.list_voltage = aat2870_ldo_list_voltage,
|
||||
.list_voltage = regulator_list_voltage_table,
|
||||
.set_voltage_sel = aat2870_ldo_set_voltage_sel,
|
||||
.get_voltage_sel = aat2870_ldo_get_voltage_sel,
|
||||
.enable = aat2870_ldo_enable,
|
||||
|
@ -119,7 +109,7 @@ static struct regulator_ops aat2870_ldo_ops = {
|
|||
.is_enabled = aat2870_ldo_is_enabled,
|
||||
};
|
||||
|
||||
static const int aat2870_ldo_voltages[] = {
|
||||
static const unsigned int aat2870_ldo_voltages[] = {
|
||||
1200000, 1300000, 1500000, 1600000,
|
||||
1800000, 2000000, 2200000, 2500000,
|
||||
2600000, 2700000, 2800000, 2900000,
|
||||
|
@ -132,11 +122,11 @@ static const int aat2870_ldo_voltages[] = {
|
|||
.name = #ids, \
|
||||
.id = AAT2870_ID_##ids, \
|
||||
.n_voltages = ARRAY_SIZE(aat2870_ldo_voltages), \
|
||||
.volt_table = aat2870_ldo_voltages, \
|
||||
.ops = &aat2870_ldo_ops, \
|
||||
.type = REGULATOR_VOLTAGE, \
|
||||
.owner = THIS_MODULE, \
|
||||
}, \
|
||||
.voltages = aat2870_ldo_voltages, \
|
||||
.min_uV = 1200000, \
|
||||
.max_uV = 3300000, \
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue