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

regulator: Convert WM835x to use get_voltage_sel()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

authored by

Mark Brown and committed by
Liam Girdwood c24516a1 4d7071f1

+6 -10
+6 -10
drivers/regulator/wm8350-regulator.c
··· 405 405 return 0; 406 406 } 407 407 408 - static int wm8350_dcdc_get_voltage(struct regulator_dev *rdev) 408 + static int wm8350_dcdc_get_voltage_sel(struct regulator_dev *rdev) 409 409 { 410 410 struct wm8350 *wm8350 = rdev_get_drvdata(rdev); 411 411 int volt_reg, dcdc = rdev_get_id(rdev); 412 - u16 val; 413 412 414 413 switch (dcdc) { 415 414 case WM8350_DCDC_1: ··· 430 431 } 431 432 432 433 /* all DCDCs have same mV bits */ 433 - val = wm8350_reg_read(wm8350, volt_reg) & WM8350_DC1_VSEL_MASK; 434 - return wm8350_dcdc_val_to_mvolts(val) * 1000; 434 + return wm8350_reg_read(wm8350, volt_reg) & WM8350_DC1_VSEL_MASK; 435 435 } 436 436 437 437 static int wm8350_dcdc_list_voltage(struct regulator_dev *rdev, ··· 805 807 return 0; 806 808 } 807 809 808 - static int wm8350_ldo_get_voltage(struct regulator_dev *rdev) 810 + static int wm8350_ldo_get_voltage_sel(struct regulator_dev *rdev) 809 811 { 810 812 struct wm8350 *wm8350 = rdev_get_drvdata(rdev); 811 813 int volt_reg, ldo = rdev_get_id(rdev); 812 - u16 val; 813 814 814 815 switch (ldo) { 815 816 case WM8350_LDO_1: ··· 828 831 } 829 832 830 833 /* all LDOs have same mV bits */ 831 - val = wm8350_reg_read(wm8350, volt_reg) & WM8350_LDO1_VSEL_MASK; 832 - return wm8350_ldo_val_to_mvolts(val) * 1000; 834 + return wm8350_reg_read(wm8350, volt_reg) & WM8350_LDO1_VSEL_MASK; 833 835 } 834 836 835 837 static int wm8350_ldo_list_voltage(struct regulator_dev *rdev, ··· 1225 1229 1226 1230 static struct regulator_ops wm8350_dcdc_ops = { 1227 1231 .set_voltage = wm8350_dcdc_set_voltage, 1228 - .get_voltage = wm8350_dcdc_get_voltage, 1232 + .get_voltage_sel = wm8350_dcdc_get_voltage_sel, 1229 1233 .list_voltage = wm8350_dcdc_list_voltage, 1230 1234 .enable = wm8350_dcdc_enable, 1231 1235 .disable = wm8350_dcdc_disable, ··· 1249 1253 1250 1254 static struct regulator_ops wm8350_ldo_ops = { 1251 1255 .set_voltage = wm8350_ldo_set_voltage, 1252 - .get_voltage = wm8350_ldo_get_voltage, 1256 + .get_voltage_sel = wm8350_ldo_get_voltage_sel, 1253 1257 .list_voltage = wm8350_ldo_list_voltage, 1254 1258 .enable = wm8350_ldo_enable, 1255 1259 .disable = wm8350_ldo_disable,