korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-17 09:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

regulator: tps65023: Convert to regulator_list_voltage_table

Browse Source 
In current mapping table settings, min_uV/max_uV are always
equal to volt_table[0] and volt_table[table_len -1].
Thus remove min_uV and max_uV from struct tps_info.

The table based mapping with table_len == 1 means fixed voltage.
So we don't need fixed flag to differentiate if it is fixed or not.

This patch adds DCDC_FIXED_3300000_VSEL_table and DCDC_FIXED_1800000_VSEL_table
for fixed voltage cases. So we can convert tps65023_dcdc_ops to
regulator_list_voltage_table. This makes the code simpler.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2012-06-19 17:12:18 +08:00 committed by Mark Brown
parent 2c19ad43d1
commit ba3bd8a301
1 changed files with 49 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
drivers/regulator/tps65023-regulator.c
View File

@ -91,48 +91,53 @@
#define TPS65023_MAX_REG_ID TPS65023_LDO_2 #define TPS65023_MAX_REG_ID TPS65023_LDO_2
/* Supported voltage values for regulators */ /* Supported voltage values for regulators */
static const u16 VCORE_VSEL_table[] = { static const unsigned int VCORE_VSEL_table[] = {
800, 825, 850, 875, 800000, 825000, 850000, 875000,
900, 925, 950, 975, 900000, 925000, 950000, 975000,
1000, 1025, 1050, 1075, 1000000, 1025000, 1050000, 1075000,
1100, 1125, 1150, 1175, 1100000, 1125000, 1150000, 1175000,
1200, 1225, 1250, 1275, 1200000, 1225000, 1250000, 1275000,
1300, 1325, 1350, 1375, 1300000, 1325000, 1350000, 1375000,
1400, 1425, 1450, 1475, 1400000, 1425000, 1450000, 1475000,
1500, 1525, 1550, 1600, 1500000, 1525000, 1550000, 1600000,
};
static const unsigned int DCDC_FIXED_3300000_VSEL_table[] = {
3300000,
};
static const unsigned int DCDC_FIXED_1800000_VSEL_table[] = {
1800000,
}; };
/* Supported voltage values for LDO regulators for tps65020 */ /* Supported voltage values for LDO regulators for tps65020 */
static const u16 TPS65020_LDO1_VSEL_table[] = { static const unsigned int TPS65020_LDO1_VSEL_table[] = {
1000, 1050, 1100, 1300, 1000000, 1050000, 1100000, 1300000,
1800, 2500, 3000, 3300, 1800000, 2500000, 3000000, 3300000,
}; };
static const u16 TPS65020_LDO2_VSEL_table[] = { static const unsigned int TPS65020_LDO2_VSEL_table[] = {
1000, 1050, 1100, 1300, 1000000, 1050000, 1100000, 1300000,
1800, 2500, 3000, 3300, 1800000, 2500000, 3000000, 3300000,
}; };
/* Supported voltage values for LDO regulators /* Supported voltage values for LDO regulators
* for tps65021 and tps65023 */ * for tps65021 and tps65023 */
static const u16 TPS65023_LDO1_VSEL_table[] = { static const unsigned int TPS65023_LDO1_VSEL_table[] = {
1000, 1100, 1300, 1800, 1000000, 1100000, 1300000, 1800000,
2200, 2600, 2800, 3150, 2200000, 2600000, 2800000, 3150000,
}; };
static const u16 TPS65023_LDO2_VSEL_table[] = { static const unsigned int TPS65023_LDO2_VSEL_table[] = {
1050, 1200, 1300, 1800, 1050000, 1200000, 1300000, 1800000,
2500, 2800, 3000, 3300, 2500000, 2800000, 3000000, 3300000,
}; };
/* Regulator specific details */ /* Regulator specific details */
struct tps_info { struct tps_info {
const char *name; const char *name;
unsigned min_uV;
unsigned max_uV;
bool fixed;
u8 table_len; u8 table_len;
const u16 *table; const unsigned int *table;
}; };
/* PMIC details */ /* PMIC details */
@ -164,9 +169,9 @@ static int tps65023_dcdc_get_voltage(struct regulator_dev *dev)
if (ret != 0) if (ret != 0)
return ret; return ret;
data &= (tps->info[dcdc]->table_len - 1); data &= (tps->info[dcdc]->table_len - 1);
return tps->info[dcdc]->table[data] * 1000; return tps->info[dcdc]->table[data];
} else } else
return tps->info[dcdc]->min_uV; return tps->info[dcdc]->table[0];
} }
static int tps65023_dcdc_set_voltage_sel(struct regulator_dev *dev, static int tps65023_dcdc_set_voltage_sel(struct regulator_dev *dev,
@ -208,7 +213,7 @@ static int tps65023_ldo_get_voltage(struct regulator_dev *dev)
data >>= (TPS65023_LDO_CTRL_LDOx_SHIFT(ldo - TPS65023_LDO_1)); data >>= (TPS65023_LDO_CTRL_LDOx_SHIFT(ldo - TPS65023_LDO_1));
data &= (tps->info[ldo]->table_len - 1); data &= (tps->info[ldo]->table_len - 1);
return tps->info[ldo]->table[data] * 1000; return tps->info[ldo]->table[data];
} }
static int tps65023_ldo_set_voltage_sel(struct regulator_dev *dev, static int tps65023_ldo_set_voltage_sel(struct regulator_dev *dev,
@ -222,39 +227,6 @@ static int tps65023_ldo_set_voltage_sel(struct regulator_dev *dev,
selector << TPS65023_LDO_CTRL_LDOx_SHIFT(ldo_index)); selector << TPS65023_LDO_CTRL_LDOx_SHIFT(ldo_index));
} }
static int tps65023_dcdc_list_voltage(struct regulator_dev *dev,
unsigned selector)
{
struct tps_pmic *tps = rdev_get_drvdata(dev);
int dcdc = rdev_get_id(dev);
if (dcdc < TPS65023_DCDC_1 || dcdc > TPS65023_DCDC_3)
return -EINVAL;
if (dcdc == tps->core_regulator) {
if (selector >= tps->info[dcdc]->table_len)
return -EINVAL;
else
return tps->info[dcdc]->table[selector] * 1000;
} else
return tps->info[dcdc]->min_uV;
}
static int tps65023_ldo_list_voltage(struct regulator_dev *dev,
unsigned selector)
{
struct tps_pmic *tps = rdev_get_drvdata(dev);
int ldo = rdev_get_id(dev);
if (ldo < TPS65023_LDO_1 || ldo > TPS65023_LDO_2)
return -EINVAL;
if (selector >= tps->info[ldo]->table_len)
return -EINVAL;
else
return tps->info[ldo]->table[selector] * 1000;
}
/* Operations permitted on VDCDCx */ /* Operations permitted on VDCDCx */
static struct regulator_ops tps65023_dcdc_ops = { static struct regulator_ops tps65023_dcdc_ops = {
.is_enabled = regulator_is_enabled_regmap, .is_enabled = regulator_is_enabled_regmap,
@ -262,7 +234,7 @@ static struct regulator_ops tps65023_dcdc_ops = {
.disable = regulator_disable_regmap, .disable = regulator_disable_regmap,
.get_voltage = tps65023_dcdc_get_voltage, .get_voltage = tps65023_dcdc_get_voltage,
.set_voltage_sel = tps65023_dcdc_set_voltage_sel, .set_voltage_sel = tps65023_dcdc_set_voltage_sel,
.list_voltage = tps65023_dcdc_list_voltage, .list_voltage = regulator_list_voltage_table,
}; };
/* Operations permitted on LDOx */ /* Operations permitted on LDOx */
@ -272,7 +244,7 @@ static struct regulator_ops tps65023_ldo_ops = {
.disable = regulator_disable_regmap, .disable = regulator_disable_regmap,
.get_voltage = tps65023_ldo_get_voltage, .get_voltage = tps65023_ldo_get_voltage,
.set_voltage_sel = tps65023_ldo_set_voltage_sel, .set_voltage_sel = tps65023_ldo_set_voltage_sel,
.list_voltage = tps65023_ldo_list_voltage, .list_voltage = regulator_list_voltage_table,
}; };
static struct regmap_config tps65023_regmap_config = { static struct regmap_config tps65023_regmap_config = {
@ -324,10 +296,8 @@ static int __devinit tps_65023_probe(struct i2c_client *client,
tps->desc[i].name = info->name; tps->desc[i].name = info->name;
tps->desc[i].id = i; tps->desc[i].id = i;
if (info->fixed)
tps->desc[i].n_voltages = 1;
else
tps->desc[i].n_voltages = info->table_len; tps->desc[i].n_voltages = info->table_len;
tps->desc[i].volt_table = info->table;
tps->desc[i].ops = (i > TPS65023_DCDC_3 ? tps->desc[i].ops = (i > TPS65023_DCDC_3 ?
&tps65023_ldo_ops : &tps65023_dcdc_ops); &tps65023_ldo_ops : &tps65023_dcdc_ops);
tps->desc[i].type = REGULATOR_VOLTAGE; tps->desc[i].type = REGULATOR_VOLTAGE;
@ -387,35 +357,26 @@ static int __devexit tps_65023_remove(struct i2c_client *client)
static const struct tps_info tps65020_regs[] = { static const struct tps_info tps65020_regs[] = {
{ {
.name = "VDCDC1", .name = "VDCDC1",
.min_uV = 3300000, .table_len = ARRAY_SIZE(DCDC_FIXED_3300000_VSEL_table),
.max_uV = 3300000, .table = DCDC_FIXED_3300000_VSEL_table,
.fixed = 1,
}, },
{ {
.name = "VDCDC2", .name = "VDCDC2",
.min_uV = 1800000, .table_len = ARRAY_SIZE(DCDC_FIXED_1800000_VSEL_table),
.max_uV = 1800000, .table = DCDC_FIXED_1800000_VSEL_table,
.fixed = 1,
}, },
{ {
.name = "VDCDC3", .name = "VDCDC3",
.min_uV = 800000,
.max_uV = 1600000,
.table_len = ARRAY_SIZE(VCORE_VSEL_table), .table_len = ARRAY_SIZE(VCORE_VSEL_table),
.table = VCORE_VSEL_table, .table = VCORE_VSEL_table,
}, },
{ {
.name = "LDO1", .name = "LDO1",
.min_uV = 1000000,
.max_uV = 3150000,
.table_len = ARRAY_SIZE(TPS65020_LDO1_VSEL_table), .table_len = ARRAY_SIZE(TPS65020_LDO1_VSEL_table),
.table = TPS65020_LDO1_VSEL_table, .table = TPS65020_LDO1_VSEL_table,
}, },
{ {
.name = "LDO2", .name = "LDO2",
.min_uV = 1050000,
.max_uV = 3300000,
.table_len = ARRAY_SIZE(TPS65020_LDO2_VSEL_table), .table_len = ARRAY_SIZE(TPS65020_LDO2_VSEL_table),
.table = TPS65020_LDO2_VSEL_table, .table = TPS65020_LDO2_VSEL_table,
}, },
@ -424,34 +385,26 @@ static const struct tps_info tps65020_regs[] = {
static const struct tps_info tps65021_regs[] = { static const struct tps_info tps65021_regs[] = {
{ {
.name = "VDCDC1", .name = "VDCDC1",
.min_uV = 3300000, .table_len = ARRAY_SIZE(DCDC_FIXED_3300000_VSEL_table),
.max_uV = 3300000, .table = DCDC_FIXED_3300000_VSEL_table,
.fixed = 1,
}, },
{ {
.name = "VDCDC2", .name = "VDCDC2",
.min_uV = 1800000, .table_len = ARRAY_SIZE(DCDC_FIXED_1800000_VSEL_table),
.max_uV = 1800000, .table = DCDC_FIXED_1800000_VSEL_table,
.fixed = 1,
}, },
{ {
.name = "VDCDC3", .name = "VDCDC3",
.min_uV = 800000,
.max_uV = 1600000,
.table_len = ARRAY_SIZE(VCORE_VSEL_table), .table_len = ARRAY_SIZE(VCORE_VSEL_table),
.table = VCORE_VSEL_table, .table = VCORE_VSEL_table,
}, },
{ {
.name = "LDO1", .name = "LDO1",
.min_uV = 1000000,
.max_uV = 3150000,
.table_len = ARRAY_SIZE(TPS65023_LDO1_VSEL_table), .table_len = ARRAY_SIZE(TPS65023_LDO1_VSEL_table),
.table = TPS65023_LDO1_VSEL_table, .table = TPS65023_LDO1_VSEL_table,
}, },
{ {
.name = "LDO2", .name = "LDO2",
.min_uV = 1050000,
.max_uV = 3300000,
.table_len = ARRAY_SIZE(TPS65023_LDO2_VSEL_table), .table_len = ARRAY_SIZE(TPS65023_LDO2_VSEL_table),
.table = TPS65023_LDO2_VSEL_table, .table = TPS65023_LDO2_VSEL_table,
}, },
@ -460,34 +413,26 @@ static const struct tps_info tps65021_regs[] = {
static const struct tps_info tps65023_regs[] = { static const struct tps_info tps65023_regs[] = {
{ {
.name = "VDCDC1", .name = "VDCDC1",
.min_uV = 800000,
.max_uV = 1600000,
.table_len = ARRAY_SIZE(VCORE_VSEL_table), .table_len = ARRAY_SIZE(VCORE_VSEL_table),
.table = VCORE_VSEL_table, .table = VCORE_VSEL_table,
}, },
{ {
.name = "VDCDC2", .name = "VDCDC2",
.min_uV = 3300000, .table_len = ARRAY_SIZE(DCDC_FIXED_3300000_VSEL_table),
.max_uV = 3300000, .table = DCDC_FIXED_3300000_VSEL_table,
.fixed = 1,
}, },
{ {
.name = "VDCDC3", .name = "VDCDC3",
.min_uV = 1800000, .table_len = ARRAY_SIZE(DCDC_FIXED_1800000_VSEL_table),
.max_uV = 1800000, .table = DCDC_FIXED_1800000_VSEL_table,
.fixed = 1,
}, },
{ {
.name = "LDO1", .name = "LDO1",
.min_uV = 1000000,
.max_uV = 3150000,
.table_len = ARRAY_SIZE(TPS65023_LDO1_VSEL_table), .table_len = ARRAY_SIZE(TPS65023_LDO1_VSEL_table),
.table = TPS65023_LDO1_VSEL_table, .table = TPS65023_LDO1_VSEL_table,
}, },
{ {
.name = "LDO2", .name = "LDO2",
.min_uV = 1050000,
.max_uV = 3300000,
.table_len = ARRAY_SIZE(TPS65023_LDO2_VSEL_table), .table_len = ARRAY_SIZE(TPS65023_LDO2_VSEL_table),
.table = TPS65023_LDO2_VSEL_table, .table = TPS65023_LDO2_VSEL_table,
}, },