hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

regulator: max1586: Convert max1586_v3_ops to regulator_list_voltage_linear 

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-08 08:25:41 +08:00 committed by Mark Brown
parent f464703793
commit 93f5de5c58
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/regulator/max1586.c
View File

@ -63,14 +63,6 @@ static int v6_voltages_uv[] = { 1, 1800000, 2500000, 3000000 };
* R24 and R25=100kOhm as described in the data sheet. * R24 and R25=100kOhm as described in the data sheet.
* The gain is approximately: 1 + R24/R25 + R24/185.5kOhm * The gain is approximately: 1 + R24/R25 + R24/185.5kOhm
*/ */
static int max1586_v3_calc_voltage(struct max1586_data *max1586,
unsigned selector)
{
unsigned range_uV = max1586->max_uV - max1586->min_uV;
return max1586->min_uV + (selector * range_uV / MAX1586_V3_MAX_VSEL);
}
static int max1586_v3_set(struct regulator_dev *rdev, int min_uV, int max_uV, static int max1586_v3_set(struct regulator_dev *rdev, int min_uV, int max_uV,
unsigned *selector) unsigned *selector)
{ {
@ -86,25 +78,16 @@ static int max1586_v3_set(struct regulator_dev *rdev, int min_uV, int max_uV,
*selector = DIV_ROUND_UP((min_uV - max1586->min_uV) * *selector = DIV_ROUND_UP((min_uV - max1586->min_uV) *
MAX1586_V3_MAX_VSEL, range_uV); MAX1586_V3_MAX_VSEL, range_uV);
if (max1586_v3_calc_voltage(max1586, *selector) > max_uV) if (regulator_list_voltage_linear(rdev, *selector) > max_uV)
return -EINVAL; return -EINVAL;
dev_dbg(&client->dev, "changing voltage v3 to %dmv\n", dev_dbg(&client->dev, "changing voltage v3 to %dmv\n",
max1586_v3_calc_voltage(max1586, *selector) / 1000); regulator_list_voltage_linear(rdev, *selector) / 1000);
v3_prog = I2C_V3_SELECT | (u8) *selector; v3_prog = I2C_V3_SELECT | (u8) *selector;
return i2c_smbus_write_byte(client, v3_prog); return i2c_smbus_write_byte(client, v3_prog);
} }
static int max1586_v3_list(struct regulator_dev *rdev, unsigned selector)
{
struct max1586_data *max1586 = rdev_get_drvdata(rdev);
if (selector > MAX1586_V3_MAX_VSEL)
return -EINVAL;
return max1586_v3_calc_voltage(max1586, selector);
}
static int max1586_v6_set_voltage_sel(struct regulator_dev *rdev, static int max1586_v6_set_voltage_sel(struct regulator_dev *rdev,
unsigned int selector) unsigned int selector)
{ {
@ -124,7 +107,7 @@ static int max1586_v6_set_voltage_sel(struct regulator_dev *rdev,
*/ */
static struct regulator_ops max1586_v3_ops = { static struct regulator_ops max1586_v3_ops = {
.set_voltage = max1586_v3_set, .set_voltage = max1586_v3_set,
.list_voltage = max1586_v3_list, .list_voltage = regulator_list_voltage_linear,
}; };
static struct regulator_ops max1586_v6_ops = { static struct regulator_ops max1586_v6_ops = {
@ -132,7 +115,7 @@ static struct regulator_ops max1586_v6_ops = {
.list_voltage = regulator_list_voltage_table, .list_voltage = regulator_list_voltage_table,
}; };
static const struct regulator_desc max1586_reg[] = { static struct regulator_desc max1586_reg[] = {
{ {
.name = "Output_V3", .name = "Output_V3",
.id = MAX1586_V3, .id = MAX1586_V3,
@ -185,6 +168,13 @@ static int __devinit max1586_pmic_probe(struct i2c_client *client,
goto err; goto err;
} }
if (id == MAX1586_V3) {
max1586_reg[id].min_uV = max1586->min_uV;
max1586_reg[id].uV_step =
(max1586->max_uV - max1586->min_uV) /
MAX1586_V3_MAX_VSEL;
}
config.dev = &client->dev; config.dev = &client->dev;
config.init_data = pdata->subdevs[i].platform_data; config.init_data = pdata->subdevs[i].platform_data;
config.driver_data = max1586; config.driver_data = max1586;