From 2f950ca8f2550674dc71f3533428509065e2c6f9 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 15 May 2012 10:24:56 +0800 Subject: [PATCH] --- yaml --- r: 302297 b: refs/heads/master c: bae5e9c33f44633b71d69b350884b243874fd92d h: refs/heads/master i: 302295: 9c35fe8a845540a4850c10ad4ed5219ce28dcebb v: v3 --- [refs] | 2 +- trunk/drivers/regulator/da903x.c | 73 +++----------------------------- 2 files changed, 7 insertions(+), 68 deletions(-) diff --git a/[refs] b/[refs] index 0da22a40849b..f913a4b9751e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c972a029483ac5a546a6405e30e4eede6fbd19f9 +refs/heads/master: bae5e9c33f44633b71d69b350884b243874fd92d diff --git a/trunk/drivers/regulator/da903x.c b/trunk/drivers/regulator/da903x.c index 6e78ef1667fb..1005f5f7e603 100644 --- a/trunk/drivers/regulator/da903x.c +++ b/trunk/drivers/regulator/da903x.c @@ -101,8 +101,7 @@ static inline int check_range(struct da903x_regulator_info *info, } /* DA9030/DA9034 common operations */ -static int da903x_set_ldo_voltage_sel(struct regulator_dev *rdev, - unsigned selector) +static int da903x_set_voltage_sel(struct regulator_dev *rdev, unsigned selector) { struct da903x_regulator_info *info = rdev_get_drvdata(rdev); struct device *da9034_dev = to_da903x_dev(rdev); @@ -185,19 +184,6 @@ static int da9030_set_ldo1_15_voltage_sel(struct regulator_dev *rdev, return da903x_update(da903x_dev, info->vol_reg, val, mask); } -static int da9030_set_ldo14_voltage_sel(struct regulator_dev *rdev, - unsigned selector) -{ - struct da903x_regulator_info *info = rdev_get_drvdata(rdev); - struct device *da903x_dev = to_da903x_dev(rdev); - uint8_t val, mask; - - val = selector << info->vol_shift; - mask = ((1 << info->vol_nbits) - 1) << info->vol_shift; - - return da903x_update(da903x_dev, info->vol_reg, val, mask); -} - static int da9030_map_ldo14_voltage(struct regulator_dev *rdev, int min_uV, int max_uV) { @@ -220,23 +206,6 @@ static int da9030_map_ldo14_voltage(struct regulator_dev *rdev, return sel; } -static int da9030_get_ldo14_voltage_sel(struct regulator_dev *rdev) -{ - struct da903x_regulator_info *info = rdev_get_drvdata(rdev); - struct device *da903x_dev = to_da903x_dev(rdev); - uint8_t val, mask; - int ret; - - ret = da903x_read(da903x_dev, info->vol_reg, &val); - if (ret) - return ret; - - mask = ((1 << info->vol_nbits) - 1) << info->vol_shift; - val = (val & mask) >> info->vol_shift; - - return val; -} - static int da9030_list_ldo14_voltage(struct regulator_dev *rdev, unsigned selector) { @@ -277,19 +246,6 @@ static int da9034_set_dvc_voltage_sel(struct regulator_dev *rdev, return ret; } -static int da9034_set_ldo12_voltage_sel(struct regulator_dev *rdev, - unsigned selector) -{ - struct da903x_regulator_info *info = rdev_get_drvdata(rdev); - struct device *da9034_dev = to_da903x_dev(rdev); - uint8_t val, mask; - - val = selector << info->vol_shift; - mask = ((1 << info->vol_nbits) - 1) << info->vol_shift; - - return da903x_update(da9034_dev, info->vol_reg, val, mask); -} - static int da9034_map_ldo12_voltage(struct regulator_dev *rdev, int min_uV, int max_uV) { @@ -307,23 +263,6 @@ static int da9034_map_ldo12_voltage(struct regulator_dev *rdev, return sel; } -static int da9034_get_ldo12_voltage_sel(struct regulator_dev *rdev) -{ - struct da903x_regulator_info *info = rdev_get_drvdata(rdev); - struct device *da9034_dev = to_da903x_dev(rdev); - uint8_t val, mask; - int ret; - - ret = da903x_read(da9034_dev, info->vol_reg, &val); - if (ret) - return ret; - - mask = ((1 << info->vol_nbits) - 1) << info->vol_shift; - val = (val & mask) >> info->vol_shift; - - return val; -} - static int da9034_list_ldo12_voltage(struct regulator_dev *rdev, unsigned selector) { @@ -342,7 +281,7 @@ static int da9034_list_ldo12_voltage(struct regulator_dev *rdev, } static struct regulator_ops da903x_regulator_ldo_ops = { - .set_voltage_sel = da903x_set_ldo_voltage_sel, + .set_voltage_sel = da903x_set_voltage_sel, .get_voltage_sel = da903x_get_voltage_sel, .list_voltage = regulator_list_voltage_linear, .map_voltage = regulator_map_voltage_linear, @@ -353,8 +292,8 @@ static struct regulator_ops da903x_regulator_ldo_ops = { /* NOTE: this is dedicated for the insane DA9030 LDO14 */ static struct regulator_ops da9030_regulator_ldo14_ops = { - .set_voltage_sel = da9030_set_ldo14_voltage_sel, - .get_voltage_sel = da9030_get_ldo14_voltage_sel, + .set_voltage_sel = da903x_set_voltage_sel, + .get_voltage_sel = da903x_get_voltage_sel, .list_voltage = da9030_list_ldo14_voltage, .map_voltage = da9030_map_ldo14_voltage, .enable = da903x_enable, @@ -385,8 +324,8 @@ static struct regulator_ops da9034_regulator_dvc_ops = { /* NOTE: this is dedicated for the insane LDO12 */ static struct regulator_ops da9034_regulator_ldo12_ops = { - .set_voltage_sel = da9034_set_ldo12_voltage_sel, - .get_voltage_sel = da9034_get_ldo12_voltage_sel, + .set_voltage_sel = da903x_set_voltage_sel, + .get_voltage_sel = da903x_get_voltage_sel, .list_voltage = da9034_list_ldo12_voltage, .map_voltage = da9034_map_ldo12_voltage, .enable = da903x_enable,