mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-16 17:23:55 +08:00
regulator: mt6397: Remove modeset_shift from struct mt6397_regulator_info
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:
parent
d6208ba870
commit
12401a1cef
@ -32,7 +32,6 @@ struct mt6397_regulator_info {
|
||||
u32 vselctrl_mask;
|
||||
u32 modeset_reg;
|
||||
u32 modeset_mask;
|
||||
u32 modeset_shift;
|
||||
};
|
||||
|
||||
#define MT6397_BUCK(match, vreg, min, max, step, volt_ranges, enreg, \
|
||||
@ -61,7 +60,6 @@ struct mt6397_regulator_info {
|
||||
.vselctrl_mask = BIT(1), \
|
||||
.modeset_reg = _modeset_reg, \
|
||||
.modeset_mask = BIT(_modeset_shift), \
|
||||
.modeset_shift = _modeset_shift \
|
||||
}
|
||||
|
||||
#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;
|
||||
}
|
||||
|
||||
dev_dbg(&rdev->dev, "mt6397 buck set_mode %#x, %#x, %#x, %#x\n",
|
||||
info->modeset_reg, info->modeset_mask,
|
||||
info->modeset_shift, val);
|
||||
dev_dbg(&rdev->dev, "mt6397 buck set_mode %#x, %#x, %#x\n",
|
||||
info->modeset_reg, info->modeset_mask, val);
|
||||
|
||||
val <<= ffs(info->modeset_mask) - 1;
|
||||
|
||||
val <<= info->modeset_shift;
|
||||
ret = regmap_update_bits(rdev->regmap, info->modeset_reg,
|
||||
info->modeset_mask, val);
|
||||
err_mode:
|
||||
@ -204,7 +202,10 @@ static unsigned int mt6397_regulator_get_mode(struct regulator_dev *rdev)
|
||||
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:
|
||||
return REGULATOR_MODE_NORMAL;
|
||||
case MT6397_BUCK_MODE_FORCE_PWM:
|
||||
|
Loading…
Reference in New Issue
Block a user