From 033095617614590a9d500681ba2f60a9cd7835e3 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 9 Jul 2012 11:26:28 +0800 Subject: [PATCH] --- yaml --- r: 312639 b: refs/heads/master c: 4bcb9f43426dcb7b326d4b5448f198eea4867e63 h: refs/heads/master i: 312637: 936f131b7f518e5f5838a547b50af9d0bd1cdd8c 312635: 79b3a30437bfa9c3feb6a2f6ab1e011817286e8b 312631: ae073693b1fd6c8bac1b5e3afbfa305816ec5c5b 312623: fe17072a18f510271fdb931bc1f6d0b58bd55acb 312607: 3ee5bf6476d035318ee279789982c386d0daae02 312575: 899f2c176522ec8f7f1e916476ce1dfb45d83d70 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/twl-regulator.c | 24 +++++++----------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index e579057d1418..a570889f2b98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3cb80f43a9bc9b64aedd14b100e99252767d78c +refs/heads/master: 4bcb9f43426dcb7b326d4b5448f198eea4867e63 diff --git a/trunk/drivers/regulator/twl-regulator.c b/trunk/drivers/regulator/twl-regulator.c index bb51decfcb8e..de99b784c5da 100644 --- a/trunk/drivers/regulator/twl-regulator.c +++ b/trunk/drivers/regulator/twl-regulator.c @@ -560,37 +560,27 @@ static struct regulator_ops twl6030coresmps_ops = { }; static int -twl6030ldo_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV, - unsigned *selector) +twl6030ldo_set_voltage_sel(struct regulator_dev *rdev, unsigned selector) { struct twlreg_info *info = rdev_get_drvdata(rdev); - int vsel; - if ((min_uV/1000 < info->min_mV) || (max_uV/1000 > info->max_mV)) - return -EDOM; - - vsel = DIV_ROUND_UP(min_uV - rdev->desc->min_uV, rdev->desc->uV_step); - *selector = vsel; - - return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE, vsel); + return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE, + selector); } -static int twl6030ldo_get_voltage(struct regulator_dev *rdev) +static int twl6030ldo_get_voltage_sel(struct regulator_dev *rdev) { struct twlreg_info *info = rdev_get_drvdata(rdev); int vsel = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE); - if (vsel < 0) - return vsel; - - return rdev->desc->min_uV + vsel * rdev->desc->uV_step; + return vsel; } static struct regulator_ops twl6030ldo_ops = { .list_voltage = regulator_list_voltage_linear, - .set_voltage = twl6030ldo_set_voltage, - .get_voltage = twl6030ldo_get_voltage, + .set_voltage_sel = twl6030ldo_set_voltage_sel, + .get_voltage_sel = twl6030ldo_get_voltage_sel, .enable = twl6030reg_enable, .disable = twl6030reg_disable,