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

regulator: Convert WM8994 to use get_voltage_sel() 

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
This commit is contained in:
Mark Brown 2010-12-12 14:07:06 +00:00 committed by Liam Girdwood
parent c24516a1d6
commit d9f0f28717
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/regulator/wm8994-regulator.c
View File

@ -86,7 +86,7 @@ static int wm8994_ldo1_list_voltage(struct regulator_dev *rdev,
return (selector * 100000) + 2400000; return (selector * 100000) + 2400000;
} }
static int wm8994_ldo1_get_voltage(struct regulator_dev *rdev) static int wm8994_ldo1_get_voltage_sel(struct regulator_dev *rdev)
{ {
struct wm8994_ldo *ldo = rdev_get_drvdata(rdev); struct wm8994_ldo *ldo = rdev_get_drvdata(rdev);
int val; int val;
@ -95,9 +95,7 @@ static int wm8994_ldo1_get_voltage(struct regulator_dev *rdev)
if (val < 0) if (val < 0)
return val; return val;
val = (val & WM8994_LDO1_VSEL_MASK) >> WM8994_LDO1_VSEL_SHIFT; return (val & WM8994_LDO1_VSEL_MASK) >> WM8994_LDO1_VSEL_SHIFT;
return wm8994_ldo1_list_voltage(rdev, val);
} }
static int wm8994_ldo1_set_voltage(struct regulator_dev *rdev, static int wm8994_ldo1_set_voltage(struct regulator_dev *rdev,
@ -125,7 +123,7 @@ static struct regulator_ops wm8994_ldo1_ops = {
.enable_time = wm8994_ldo_enable_time, .enable_time = wm8994_ldo_enable_time,
.list_voltage = wm8994_ldo1_list_voltage, .list_voltage = wm8994_ldo1_list_voltage,
.get_voltage = wm8994_ldo1_get_voltage, .get_voltage_sel = wm8994_ldo1_get_voltage_sel,
.set_voltage = wm8994_ldo1_set_voltage, .set_voltage = wm8994_ldo1_set_voltage,
}; };
@ -138,7 +136,7 @@ static int wm8994_ldo2_list_voltage(struct regulator_dev *rdev,
return (selector * 100000) + 900000; return (selector * 100000) + 900000;
} }
static int wm8994_ldo2_get_voltage(struct regulator_dev *rdev) static int wm8994_ldo2_get_voltage_sel(struct regulator_dev *rdev)
{ {
struct wm8994_ldo *ldo = rdev_get_drvdata(rdev); struct wm8994_ldo *ldo = rdev_get_drvdata(rdev);
int val; int val;
@ -147,9 +145,7 @@ static int wm8994_ldo2_get_voltage(struct regulator_dev *rdev)
if (val < 0) if (val < 0)
return val; return val;
val = (val & WM8994_LDO2_VSEL_MASK) >> WM8994_LDO2_VSEL_SHIFT; return (val & WM8994_LDO2_VSEL_MASK) >> WM8994_LDO2_VSEL_SHIFT;
return wm8994_ldo2_list_voltage(rdev, val);
} }
static int wm8994_ldo2_set_voltage(struct regulator_dev *rdev, static int wm8994_ldo2_set_voltage(struct regulator_dev *rdev,
@ -177,7 +173,7 @@ static struct regulator_ops wm8994_ldo2_ops = {
.enable_time = wm8994_ldo_enable_time, .enable_time = wm8994_ldo_enable_time,
.list_voltage = wm8994_ldo2_list_voltage, .list_voltage = wm8994_ldo2_list_voltage,
.get_voltage = wm8994_ldo2_get_voltage, .get_voltage_sel = wm8994_ldo2_get_voltage_sel,
.set_voltage = wm8994_ldo2_set_voltage, .set_voltage = wm8994_ldo2_set_voltage,
}; };