Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-07 13:43:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

regulator: mt6397: Remove modeset_shift from struct mt6397_regulator_info

Browse Source 
The shift setting can be calculated via the corresponding mask field,
so remove modeset_shift.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Link: https://lore.kernel.org/r/20210629130503.2183574-3-axel.lin@ingics.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Axel Lin 2021-06-29 21:05:03 +08:00 committed by Mark Brown
parent d6208ba870
commit 12401a1cef
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/regulator/mt6397-regulator.c
View File

@ -32,7 +32,6 @@ struct mt6397_regulator_info {
u32 vselctrl_mask; u32 vselctrl_mask;
u32 modeset_reg; u32 modeset_reg;
u32 modeset_mask; u32 modeset_mask;
u32 modeset_shift;
}; };
#define MT6397_BUCK(match, vreg, min, max, step, volt_ranges, enreg, \ #define MT6397_BUCK(match, vreg, min, max, step, volt_ranges, enreg, \
@ -61,7 +60,6 @@ struct mt6397_regulator_info {
.vselctrl_mask = BIT(1), \ .vselctrl_mask = BIT(1), \
.modeset_reg = _modeset_reg, \ .modeset_reg = _modeset_reg, \
.modeset_mask = BIT(_modeset_shift), \ .modeset_mask = BIT(_modeset_shift), \
.modeset_shift = _modeset_shift \
} }
#define MT6397_LDO(match, vreg, ldo_volt_table, enreg, enbit, vosel, \ #define MT6397_LDO(match, vreg, ldo_volt_table, enreg, enbit, vosel, \
@ -175,11 +173,11 @@ static int mt6397_regulator_set_mode(struct regulator_dev *rdev,
goto err_mode; goto err_mode;
} }
dev_dbg(&rdev->dev, "mt6397 buck set_mode %#x, %#x, %#x, %#x\n", dev_dbg(&rdev->dev, "mt6397 buck set_mode %#x, %#x, %#x\n",
info->modeset_reg, info->modeset_mask, info->modeset_reg, info->modeset_mask, val);
info->modeset_shift, val);
val <<= ffs(info->modeset_mask) - 1;
val <<= info->modeset_shift;
ret = regmap_update_bits(rdev->regmap, info->modeset_reg, ret = regmap_update_bits(rdev->regmap, info->modeset_reg,
info->modeset_mask, val); info->modeset_mask, val);
err_mode: err_mode:
@ -204,7 +202,10 @@ static unsigned int mt6397_regulator_get_mode(struct regulator_dev *rdev)
return ret; return ret;
} }
switch ((regval & info->modeset_mask) >> info->modeset_shift) { regval &= info->modeset_mask;
regval >>= ffs(info->modeset_mask) - 1;
switch (regval) {
case MT6397_BUCK_MODE_AUTO: case MT6397_BUCK_MODE_AUTO:
return REGULATOR_MODE_NORMAL; return REGULATOR_MODE_NORMAL;
case MT6397_BUCK_MODE_FORCE_PWM: case MT6397_BUCK_MODE_FORCE_PWM: