Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

regulator: max8649: Convert to regulator_set_voltage_sel_regmap and regulator_map_voltage_linear

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

authored by

Axel Lin and committed by
Mark Brown
40baecee 0fb737b5

+2 -20
+2 -20
drivers/regulator/max8649.c
··· 70 70 return 0; 71 71 } 72 72 73 - static int max8649_set_voltage(struct regulator_dev *rdev, 74 - int min_uV, int max_uV, unsigned *selector) 75 - { 76 - struct max8649_regulator_info *info = rdev_get_drvdata(rdev); 77 - unsigned char data, mask; 78 - 79 - if (check_range(min_uV, max_uV)) { 80 - dev_err(info->dev, "invalid voltage range (%d, %d) uV\n", 81 - min_uV, max_uV); 82 - return -EINVAL; 83 - } 84 - data = DIV_ROUND_UP(min_uV - MAX8649_DCDC_VMIN, MAX8649_DCDC_STEP); 85 - mask = MAX8649_VOL_MASK; 86 - *selector = data & mask; 87 - 88 - return regmap_update_bits(info->regmap, rdev->desc->vsel_reg, mask, 89 - data); 90 - } 91 - 92 73 /* EN_PD means pulldown on EN input */ 93 74 static int max8649_enable(struct regulator_dev *rdev) 94 75 { ··· 157 176 } 158 177 159 178 static struct regulator_ops max8649_dcdc_ops = { 160 - .set_voltage = max8649_set_voltage, 179 + .set_voltage_sel = regulator_set_voltage_sel_regmap, 161 180 .get_voltage_sel = regulator_get_voltage_sel_regmap, 162 181 .list_voltage = regulator_list_voltage_linear, 182 + .map_voltage = regulator_map_voltage_linear, 163 183 .enable = max8649_enable, 164 184 .disable = max8649_disable, 165 185 .is_enabled = max8649_is_enabled,