android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: wm831x-dcdc: Convert wm831x_buckp_ops to regulator_list_voltage_linear

Browse Source 
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-13 20:27:14 +08:00 committed by Mark Brown
parent ec0ab07587
commit c70ad9dcf0
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/regulator/wm831x-dcdc.c
View File

@ -599,15 +599,6 @@ static struct platform_driver wm831x_buckv_driver = {
* BUCKP specifics * BUCKP specifics
*/ */
static int wm831x_buckp_list_voltage(struct regulator_dev *rdev,
unsigned selector)
{
if (selector <= WM831X_BUCKP_MAX_SELECTOR)
return 850000 + (selector * 25000);
else
return -EINVAL;
}
static int wm831x_buckp_set_voltage_int(struct regulator_dev *rdev, int reg, static int wm831x_buckp_set_voltage_int(struct regulator_dev *rdev, int reg,
int min_uV, int max_uV, int *selector) int min_uV, int max_uV, int *selector)
{ {
@ -620,7 +611,7 @@ static int wm831x_buckp_set_voltage_int(struct regulator_dev *rdev, int reg,
else else
return -EINVAL; return -EINVAL;
if (wm831x_buckp_list_voltage(rdev, vsel) > max_uV) if (regulator_list_voltage_linear(rdev, vsel) > max_uV)
return -EINVAL; return -EINVAL;
*selector = vsel; *selector = vsel;
@ -652,7 +643,7 @@ static int wm831x_buckp_set_suspend_voltage(struct regulator_dev *rdev,
static struct regulator_ops wm831x_buckp_ops = { static struct regulator_ops wm831x_buckp_ops = {
.set_voltage = wm831x_buckp_set_voltage, .set_voltage = wm831x_buckp_set_voltage,
.get_voltage_sel = regulator_get_voltage_sel_regmap, .get_voltage_sel = regulator_get_voltage_sel_regmap,
.list_voltage = wm831x_buckp_list_voltage, .list_voltage = regulator_list_voltage_linear,
.set_suspend_voltage = wm831x_buckp_set_suspend_voltage, .set_suspend_voltage = wm831x_buckp_set_suspend_voltage,
.is_enabled = regulator_is_enabled_regmap, .is_enabled = regulator_is_enabled_regmap,
@ -715,6 +706,8 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)
dcdc->desc.vsel_mask = WM831X_DC3_ON_VSEL_MASK; dcdc->desc.vsel_mask = WM831X_DC3_ON_VSEL_MASK;
dcdc->desc.enable_reg = WM831X_DCDC_ENABLE; dcdc->desc.enable_reg = WM831X_DCDC_ENABLE;
dcdc->desc.enable_mask = 1 << id; dcdc->desc.enable_mask = 1 << id;
dcdc->desc.min_uV = 850000;
dcdc->desc.uV_step = 25000;
config.dev = pdev->dev.parent; config.dev = pdev->dev.parent;
if (pdata) if (pdata)