regulator: max8660: Convert 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:
parent
bae5e9c33f
commit
134d34a835
1 changed files with 16 additions and 27 deletions
|
@ -126,13 +126,6 @@ static int max8660_dcdc_disable(struct regulator_dev *rdev)
|
||||||
return max8660_write(max8660, MAX8660_OVER1, mask, 0);
|
return max8660_write(max8660, MAX8660_OVER1, mask, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int max8660_dcdc_list(struct regulator_dev *rdev, unsigned selector)
|
|
||||||
{
|
|
||||||
if (selector > MAX8660_DCDC_MAX_SEL)
|
|
||||||
return -EINVAL;
|
|
||||||
return MAX8660_DCDC_MIN_UV + selector * MAX8660_DCDC_STEP;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int max8660_dcdc_get(struct regulator_dev *rdev)
|
static int max8660_dcdc_get(struct regulator_dev *rdev)
|
||||||
{
|
{
|
||||||
struct max8660 *max8660 = rdev_get_drvdata(rdev);
|
struct max8660 *max8660 = rdev_get_drvdata(rdev);
|
||||||
|
@ -156,7 +149,7 @@ static int max8660_dcdc_set(struct regulator_dev *rdev, int min_uV, int max_uV,
|
||||||
selector = DIV_ROUND_UP(min_uV - MAX8660_DCDC_MIN_UV,
|
selector = DIV_ROUND_UP(min_uV - MAX8660_DCDC_MIN_UV,
|
||||||
MAX8660_DCDC_STEP);
|
MAX8660_DCDC_STEP);
|
||||||
|
|
||||||
ret = max8660_dcdc_list(rdev, selector);
|
ret = regulator_list_voltage_linear(rdev, selector);
|
||||||
if (ret < 0 || ret > max_uV)
|
if (ret < 0 || ret > max_uV)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
@ -174,7 +167,7 @@ static int max8660_dcdc_set(struct regulator_dev *rdev, int min_uV, int max_uV,
|
||||||
|
|
||||||
static struct regulator_ops max8660_dcdc_ops = {
|
static struct regulator_ops max8660_dcdc_ops = {
|
||||||
.is_enabled = max8660_dcdc_is_enabled,
|
.is_enabled = max8660_dcdc_is_enabled,
|
||||||
.list_voltage = max8660_dcdc_list,
|
.list_voltage = regulator_list_voltage_linear,
|
||||||
.set_voltage = max8660_dcdc_set,
|
.set_voltage = max8660_dcdc_set,
|
||||||
.get_voltage = max8660_dcdc_get,
|
.get_voltage = max8660_dcdc_get,
|
||||||
};
|
};
|
||||||
|
@ -184,13 +177,6 @@ static struct regulator_ops max8660_dcdc_ops = {
|
||||||
* LDO5 functions
|
* LDO5 functions
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static int max8660_ldo5_list(struct regulator_dev *rdev, unsigned selector)
|
|
||||||
{
|
|
||||||
if (selector > MAX8660_LDO5_MAX_SEL)
|
|
||||||
return -EINVAL;
|
|
||||||
return MAX8660_LDO5_MIN_UV + selector * MAX8660_LDO5_STEP;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int max8660_ldo5_get(struct regulator_dev *rdev)
|
static int max8660_ldo5_get(struct regulator_dev *rdev)
|
||||||
{
|
{
|
||||||
struct max8660 *max8660 = rdev_get_drvdata(rdev);
|
struct max8660 *max8660 = rdev_get_drvdata(rdev);
|
||||||
|
@ -214,7 +200,7 @@ static int max8660_ldo5_set(struct regulator_dev *rdev, int min_uV, int max_uV,
|
||||||
selector = DIV_ROUND_UP(min_uV - MAX8660_LDO5_MIN_UV,
|
selector = DIV_ROUND_UP(min_uV - MAX8660_LDO5_MIN_UV,
|
||||||
MAX8660_LDO5_STEP);
|
MAX8660_LDO5_STEP);
|
||||||
|
|
||||||
ret = max8660_ldo5_list(rdev, selector);
|
ret = regulator_list_voltage_linear(rdev, selector);
|
||||||
if (ret < 0 || ret > max_uV)
|
if (ret < 0 || ret > max_uV)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
@ -229,7 +215,7 @@ static int max8660_ldo5_set(struct regulator_dev *rdev, int min_uV, int max_uV,
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct regulator_ops max8660_ldo5_ops = {
|
static struct regulator_ops max8660_ldo5_ops = {
|
||||||
.list_voltage = max8660_ldo5_list,
|
.list_voltage = regulator_list_voltage_linear,
|
||||||
.set_voltage = max8660_ldo5_set,
|
.set_voltage = max8660_ldo5_set,
|
||||||
.get_voltage = max8660_ldo5_get,
|
.get_voltage = max8660_ldo5_get,
|
||||||
};
|
};
|
||||||
|
@ -261,13 +247,6 @@ static int max8660_ldo67_disable(struct regulator_dev *rdev)
|
||||||
return max8660_write(max8660, MAX8660_OVER2, mask, 0);
|
return max8660_write(max8660, MAX8660_OVER2, mask, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int max8660_ldo67_list(struct regulator_dev *rdev, unsigned selector)
|
|
||||||
{
|
|
||||||
if (selector > MAX8660_LDO67_MAX_SEL)
|
|
||||||
return -EINVAL;
|
|
||||||
return MAX8660_LDO67_MIN_UV + selector * MAX8660_LDO67_STEP;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int max8660_ldo67_get(struct regulator_dev *rdev)
|
static int max8660_ldo67_get(struct regulator_dev *rdev)
|
||||||
{
|
{
|
||||||
struct max8660 *max8660 = rdev_get_drvdata(rdev);
|
struct max8660 *max8660 = rdev_get_drvdata(rdev);
|
||||||
|
@ -292,7 +271,7 @@ static int max8660_ldo67_set(struct regulator_dev *rdev, int min_uV,
|
||||||
selector = DIV_ROUND_UP(min_uV - MAX8660_LDO67_MIN_UV,
|
selector = DIV_ROUND_UP(min_uV - MAX8660_LDO67_MIN_UV,
|
||||||
MAX8660_LDO67_STEP);
|
MAX8660_LDO67_STEP);
|
||||||
|
|
||||||
ret = max8660_ldo67_list(rdev, selector);
|
ret = regulator_list_voltage_linear(rdev, selector);
|
||||||
if (ret < 0 || ret > max_uV)
|
if (ret < 0 || ret > max_uV)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
@ -308,7 +287,7 @@ static struct regulator_ops max8660_ldo67_ops = {
|
||||||
.is_enabled = max8660_ldo67_is_enabled,
|
.is_enabled = max8660_ldo67_is_enabled,
|
||||||
.enable = max8660_ldo67_enable,
|
.enable = max8660_ldo67_enable,
|
||||||
.disable = max8660_ldo67_disable,
|
.disable = max8660_ldo67_disable,
|
||||||
.list_voltage = max8660_ldo67_list,
|
.list_voltage = regulator_list_voltage_linear,
|
||||||
.get_voltage = max8660_ldo67_get,
|
.get_voltage = max8660_ldo67_get,
|
||||||
.set_voltage = max8660_ldo67_set,
|
.set_voltage = max8660_ldo67_set,
|
||||||
};
|
};
|
||||||
|
@ -321,6 +300,8 @@ static const struct regulator_desc max8660_reg[] = {
|
||||||
.type = REGULATOR_VOLTAGE,
|
.type = REGULATOR_VOLTAGE,
|
||||||
.n_voltages = MAX8660_DCDC_MAX_SEL + 1,
|
.n_voltages = MAX8660_DCDC_MAX_SEL + 1,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
.min_uV = MAX8660_DCDC_MIN_UV,
|
||||||
|
.uV_step = MAX8660_DCDC_STEP,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.name = "V4(DCDC)",
|
.name = "V4(DCDC)",
|
||||||
|
@ -329,6 +310,8 @@ static const struct regulator_desc max8660_reg[] = {
|
||||||
.type = REGULATOR_VOLTAGE,
|
.type = REGULATOR_VOLTAGE,
|
||||||
.n_voltages = MAX8660_DCDC_MAX_SEL + 1,
|
.n_voltages = MAX8660_DCDC_MAX_SEL + 1,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
.min_uV = MAX8660_DCDC_MIN_UV,
|
||||||
|
.uV_step = MAX8660_DCDC_STEP,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.name = "V5(LDO)",
|
.name = "V5(LDO)",
|
||||||
|
@ -337,6 +320,8 @@ static const struct regulator_desc max8660_reg[] = {
|
||||||
.type = REGULATOR_VOLTAGE,
|
.type = REGULATOR_VOLTAGE,
|
||||||
.n_voltages = MAX8660_LDO5_MAX_SEL + 1,
|
.n_voltages = MAX8660_LDO5_MAX_SEL + 1,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
.min_uV = MAX8660_LDO5_MIN_UV,
|
||||||
|
.uV_step = MAX8660_LDO5_STEP,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.name = "V6(LDO)",
|
.name = "V6(LDO)",
|
||||||
|
@ -345,6 +330,8 @@ static const struct regulator_desc max8660_reg[] = {
|
||||||
.type = REGULATOR_VOLTAGE,
|
.type = REGULATOR_VOLTAGE,
|
||||||
.n_voltages = MAX8660_LDO67_MAX_SEL + 1,
|
.n_voltages = MAX8660_LDO67_MAX_SEL + 1,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
.min_uV = MAX8660_LDO67_MIN_UV,
|
||||||
|
.uV_step = MAX8660_LDO67_STEP,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.name = "V7(LDO)",
|
.name = "V7(LDO)",
|
||||||
|
@ -353,6 +340,8 @@ static const struct regulator_desc max8660_reg[] = {
|
||||||
.type = REGULATOR_VOLTAGE,
|
.type = REGULATOR_VOLTAGE,
|
||||||
.n_voltages = MAX8660_LDO67_MAX_SEL + 1,
|
.n_voltages = MAX8660_LDO67_MAX_SEL + 1,
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
|
.min_uV = MAX8660_LDO67_MIN_UV,
|
||||||
|
.uV_step = MAX8660_LDO67_STEP,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Reference in a new issue