mirror of
https://github.com/torvalds/linux
synced 2024-09-22 20:37:18 +00:00
regulator: Convert 88pm8607 to get_voltage_sel
Signed-off-by: Axel Lin <axel.lin@gmail.com> Tested-by: Jett Zhou <jtzhou@marvell.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
4ca1e1d9e1
commit
509cbf848c
|
@ -246,7 +246,7 @@ static int pm8607_set_voltage_sel(struct regulator_dev *rdev, unsigned selector)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pm8607_get_voltage(struct regulator_dev *rdev)
|
static int pm8607_get_voltage_sel(struct regulator_dev *rdev)
|
||||||
{
|
{
|
||||||
struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
|
struct pm8607_regulator_info *info = rdev_get_drvdata(rdev);
|
||||||
uint8_t val, mask;
|
uint8_t val, mask;
|
||||||
|
@ -259,7 +259,7 @@ static int pm8607_get_voltage(struct regulator_dev *rdev)
|
||||||
mask = (rdev->desc->n_voltages - 1) << info->vol_shift;
|
mask = (rdev->desc->n_voltages - 1) << info->vol_shift;
|
||||||
val = ((unsigned char)ret & mask) >> info->vol_shift;
|
val = ((unsigned char)ret & mask) >> info->vol_shift;
|
||||||
|
|
||||||
return pm8607_list_voltage(rdev, val);
|
return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pm8607_enable(struct regulator_dev *rdev)
|
static int pm8607_enable(struct regulator_dev *rdev)
|
||||||
|
@ -294,7 +294,7 @@ static int pm8607_is_enabled(struct regulator_dev *rdev)
|
||||||
static struct regulator_ops pm8607_regulator_ops = {
|
static struct regulator_ops pm8607_regulator_ops = {
|
||||||
.list_voltage = pm8607_list_voltage,
|
.list_voltage = pm8607_list_voltage,
|
||||||
.set_voltage_sel = pm8607_set_voltage_sel,
|
.set_voltage_sel = pm8607_set_voltage_sel,
|
||||||
.get_voltage = pm8607_get_voltage,
|
.get_voltage_sel = pm8607_get_voltage_sel,
|
||||||
.enable = pm8607_enable,
|
.enable = pm8607_enable,
|
||||||
.disable = pm8607_disable,
|
.disable = pm8607_disable,
|
||||||
.is_enabled = pm8607_is_enabled,
|
.is_enabled = pm8607_is_enabled,
|
||||||
|
|
Loading…
Reference in a new issue