From 0e71c64fc070907365312ff0fcf80180961ec75a Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 15 May 2012 00:15:11 +0800 Subject: [PATCH] --- yaml --- r: 302291 b: refs/heads/master c: 40baecee48fc47399338972f9ae121f965225876 h: refs/heads/master i: 302289: 337c897207fdd354065309f7cfd9f7592e417d6a 302287: c70fdd8736f6eabc0be70b3022f163ecf4f782e0 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/max8649.c | 22 ++-------------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/[refs] b/[refs] index ddba60338ef3..4817c08a863e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fb737b566d8eafbb2ff25b2643c037e0517a9c1 +refs/heads/master: 40baecee48fc47399338972f9ae121f965225876 diff --git a/trunk/drivers/regulator/max8649.c b/trunk/drivers/regulator/max8649.c index 0cfd17247485..39fffb2e4036 100644 --- a/trunk/drivers/regulator/max8649.c +++ b/trunk/drivers/regulator/max8649.c @@ -70,25 +70,6 @@ static inline int check_range(int min_uV, int max_uV) return 0; } -static int max8649_set_voltage(struct regulator_dev *rdev, - int min_uV, int max_uV, unsigned *selector) -{ - struct max8649_regulator_info *info = rdev_get_drvdata(rdev); - unsigned char data, mask; - - if (check_range(min_uV, max_uV)) { - dev_err(info->dev, "invalid voltage range (%d, %d) uV\n", - min_uV, max_uV); - return -EINVAL; - } - data = DIV_ROUND_UP(min_uV - MAX8649_DCDC_VMIN, MAX8649_DCDC_STEP); - mask = MAX8649_VOL_MASK; - *selector = data & mask; - - return regmap_update_bits(info->regmap, rdev->desc->vsel_reg, mask, - data); -} - /* EN_PD means pulldown on EN input */ static int max8649_enable(struct regulator_dev *rdev) { @@ -176,9 +157,10 @@ static unsigned int max8649_get_mode(struct regulator_dev *rdev) } static struct regulator_ops max8649_dcdc_ops = { - .set_voltage = max8649_set_voltage, + .set_voltage_sel = regulator_set_voltage_sel_regmap, .get_voltage_sel = regulator_get_voltage_sel_regmap, .list_voltage = regulator_list_voltage_linear, + .map_voltage = regulator_map_voltage_linear, .enable = max8649_enable, .disable = max8649_disable, .is_enabled = max8649_is_enabled,