iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: tps65217: Convert to set_voltage_sel and map_voltage

Browse Source 
Convert tps65217_pmic_ops to use set_voltage_sel and map_voltage.
After this convertion, we can also use tps65217_pmic_set_voltage_sel()
for set_voltage_sel callback of tps65217_pmic_ldo1_ops.
Thus this patch also removes tps65217_pmic_ldo1_set_voltage_sel() function.

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-05-15 15:17:58 +08:00 committed by Mark Brown
parent 3a8334b948
commit 8b22285fd7
1 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
drivers/regulator/tps65217-regulator.c
View File

@ -213,54 +213,17 @@ static int tps65217_pmic_get_voltage_sel(struct regulator_dev *dev)
return selector; return selector;
} }
static int tps65217_pmic_ldo1_set_voltage_sel(struct regulator_dev *dev, static int tps65217_pmic_set_voltage_sel(struct regulator_dev *dev,
unsigned selector) unsigned selector)
{
struct tps65217 *tps = rdev_get_drvdata(dev);
int ldo = rdev_get_id(dev);
if (ldo != TPS65217_LDO_1)
return -EINVAL;
if (selector >= tps->info[ldo]->table_len)
return -EINVAL;
/* Set the voltage based on vsel value and write protect level is 2 */
return tps65217_set_bits(tps, tps->info[ldo]->set_vout_reg,
tps->info[ldo]->set_vout_mask,
selector, TPS65217_PROTECT_L2);
}
static int tps65217_pmic_set_voltage(struct regulator_dev *dev,
int min_uV, int max_uV, unsigned *selector)
{ {
int ret; int ret;
struct tps65217 *tps = rdev_get_drvdata(dev); struct tps65217 *tps = rdev_get_drvdata(dev);
unsigned int rid = rdev_get_id(dev); unsigned int rid = rdev_get_id(dev);
/* LDO1 implements set_voltage_sel callback */
if (rid == TPS65217_LDO_1)
return -EINVAL;
if (rid < TPS65217_DCDC_1 || rid > TPS65217_LDO_4)
return -EINVAL;
if (min_uV < tps->info[rid]->min_uV
|| min_uV > tps->info[rid]->max_uV)
return -EINVAL;
if (max_uV < tps->info[rid]->min_uV
|| max_uV > tps->info[rid]->max_uV)
return -EINVAL;
ret = tps->info[rid]->uv_to_vsel(min_uV, selector);
if (ret)
return ret;
/* Set the voltage based on vsel value and write protect level is 2 */ /* Set the voltage based on vsel value and write protect level is 2 */
ret = tps65217_set_bits(tps, tps->info[rid]->set_vout_reg, ret = tps65217_set_bits(tps, tps->info[rid]->set_vout_reg,
tps->info[rid]->set_vout_mask, tps->info[rid]->set_vout_mask,
*selector, TPS65217_PROTECT_L2); selector, TPS65217_PROTECT_L2);
/* Set GO bit for DCDCx to initiate voltage transistion */ /* Set GO bit for DCDCx to initiate voltage transistion */
switch (rid) { switch (rid) {
@ -274,6 +237,34 @@ static int tps65217_pmic_set_voltage(struct regulator_dev *dev,
return ret; return ret;
} }
static int tps65217_pmic_map_voltage(struct regulator_dev *dev,
int min_uV, int max_uV)
{
struct tps65217 *tps = rdev_get_drvdata(dev);
unsigned int sel, rid = rdev_get_id(dev);
int ret;
/* LDO1 uses regulator_map_voltage_iterate() */
if (rid == TPS65217_LDO_1)
return -EINVAL;
if (rid < TPS65217_DCDC_1 || rid > TPS65217_LDO_4)
return -EINVAL;
if (min_uV < tps->info[rid]->min_uV || min_uV > tps->info[rid]->max_uV)
return -EINVAL;
if (max_uV < tps->info[rid]->min_uV || max_uV > tps->info[rid]->max_uV)
return -EINVAL;
ret = tps->info[rid]->uv_to_vsel(min_uV, &sel);
if (ret)
return ret;
return sel;
}
static int tps65217_pmic_list_voltage(struct regulator_dev *dev, static int tps65217_pmic_list_voltage(struct regulator_dev *dev,
unsigned selector) unsigned selector)
{ {
@ -298,8 +289,9 @@ static struct regulator_ops tps65217_pmic_ops = {
.enable = tps65217_pmic_enable, .enable = tps65217_pmic_enable,
.disable = tps65217_pmic_disable, .disable = tps65217_pmic_disable,
.get_voltage_sel = tps65217_pmic_get_voltage_sel, .get_voltage_sel = tps65217_pmic_get_voltage_sel,
.set_voltage = tps65217_pmic_set_voltage, .set_voltage_sel = tps65217_pmic_set_voltage_sel,
.list_voltage = tps65217_pmic_list_voltage, .list_voltage = tps65217_pmic_list_voltage,
.map_voltage = tps65217_pmic_map_voltage,
}; };
/* Operations permitted on LDO1 */ /* Operations permitted on LDO1 */
@ -308,7 +300,7 @@ static struct regulator_ops tps65217_pmic_ldo1_ops = {
.enable = tps65217_pmic_enable, .enable = tps65217_pmic_enable,
.disable = tps65217_pmic_disable, .disable = tps65217_pmic_disable,
.get_voltage_sel = tps65217_pmic_get_voltage_sel, .get_voltage_sel = tps65217_pmic_get_voltage_sel,
.set_voltage_sel = tps65217_pmic_ldo1_set_voltage_sel, .set_voltage_sel = tps65217_pmic_set_voltage_sel,
.list_voltage = tps65217_pmic_list_voltage, .list_voltage = tps65217_pmic_list_voltage,
}; };