hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

regulator: pv88060: Convert to use regulator_set/get_current_limit_regmap 

Use regulator_set/get_current_limit_regmap helpers to save some code.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Steve Twiss <stwiss.opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Axel Lin 2019-02-28 21:40:19 +08:00 committed by Mark Brown
parent 1aad9f2f79
commit 9a5b3e5b2f
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/regulator/pv88060-regulator.c
View File

@ -53,10 +53,6 @@ enum {
struct pv88060_regulator { struct pv88060_regulator {
struct regulator_desc desc; struct regulator_desc desc;
/* Current limiting */
unsigned n_current_limits;
const int *current_limits;
unsigned int limit_mask;
unsigned int conf; /* buck configuration register */ unsigned int conf; /* buck configuration register */
}; };
@ -75,7 +71,7 @@ static const struct regmap_config pv88060_regmap_config = {
* Entry indexes corresponds to register values. * Entry indexes corresponds to register values.
*/ */
static const int pv88060_buck1_limits[] = { static const unsigned int pv88060_buck1_limits[] = {
1496000, 2393000, 3291000, 4189000 1496000, 2393000, 3291000, 4189000
}; };
@ -128,40 +124,6 @@ static int pv88060_buck_set_mode(struct regulator_dev *rdev,
PV88060_BUCK_MODE_MASK, val); PV88060_BUCK_MODE_MASK, val);
} }
static int pv88060_set_current_limit(struct regulator_dev *rdev, int min,
int max)
{
struct pv88060_regulator *info = rdev_get_drvdata(rdev);
int i;
/* search for closest to maximum */
for (i = info->n_current_limits - 1; i >= 0; i--) {
if (min <= info->current_limits[i]
&& max >= info->current_limits[i]) {
return regmap_update_bits(rdev->regmap,
info->conf,
info->limit_mask,
i << PV88060_BUCK_ILIM_SHIFT);
}
}
return -EINVAL;
}
static int pv88060_get_current_limit(struct regulator_dev *rdev)
{
struct pv88060_regulator *info = rdev_get_drvdata(rdev);
unsigned int data;
int ret;
ret = regmap_read(rdev->regmap, info->conf, &data);
if (ret < 0)
return ret;
data = (data & info->limit_mask) >> PV88060_BUCK_ILIM_SHIFT;
return info->current_limits[data];
}
static const struct regulator_ops pv88060_buck_ops = { static const struct regulator_ops pv88060_buck_ops = {
.get_mode = pv88060_buck_get_mode, .get_mode = pv88060_buck_get_mode,
.set_mode = pv88060_buck_set_mode, .set_mode = pv88060_buck_set_mode,
@ -171,8 +133,8 @@ static const struct regulator_ops pv88060_buck_ops = {
.set_voltage_sel = regulator_set_voltage_sel_regmap, .set_voltage_sel = regulator_set_voltage_sel_regmap,
.get_voltage_sel = regulator_get_voltage_sel_regmap, .get_voltage_sel = regulator_get_voltage_sel_regmap,
.list_voltage = regulator_list_voltage_linear, .list_voltage = regulator_list_voltage_linear,
.set_current_limit = pv88060_set_current_limit, .set_current_limit = regulator_set_current_limit_regmap,
.get_current_limit = pv88060_get_current_limit, .get_current_limit = regulator_get_current_limit_regmap,
}; };
static const struct regulator_ops pv88060_ldo_ops = { static const struct regulator_ops pv88060_ldo_ops = {
@ -207,10 +169,11 @@ static const struct regulator_ops pv88060_sw_ops = {
.enable_mask = PV88060_BUCK_EN, \ .enable_mask = PV88060_BUCK_EN, \
.vsel_reg = PV88060_REG_##regl_name##_CONF0,\ .vsel_reg = PV88060_REG_##regl_name##_CONF0,\
.vsel_mask = PV88060_VBUCK_MASK,\ .vsel_mask = PV88060_VBUCK_MASK,\
.curr_table = limits_array,\
.n_current_limits = ARRAY_SIZE(limits_array),\
.csel_reg = PV88060_REG_##regl_name##_CONF1,\
.csel_mask = PV88060_BUCK_ILIM_MASK,\
},\ },\
.current_limits = limits_array,\
.n_current_limits = ARRAY_SIZE(limits_array),\
.limit_mask = PV88060_BUCK_ILIM_MASK, \
.conf = PV88060_REG_##regl_name##_CONF1,\ .conf = PV88060_REG_##regl_name##_CONF1,\
} }