Skip to content

Commit

Permalink
regulator: tps65910: Simplify setting enable_mask for regulators
Browse files Browse the repository at this point in the history
BBCH_BBCHEN_MASK is equivalent to TPS65910_SUPPLY_STATE_ENABLED.
So all regulators have the same enable_mask setting.

BBCH_BBCHEN_MASK and BBCH_BBCHEN_SHIFT are not used now, remove them.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Axel Lin authored and Mark Brown committed Dec 30, 2013
1 parent 03746dc commit b8903eb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
16 changes: 1 addition & 15 deletions drivers/regulator/tps65910-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -1207,21 +1207,7 @@ static int tps65910_probe(struct platform_device *pdev)
pmic->desc[i].type = REGULATOR_VOLTAGE;
pmic->desc[i].owner = THIS_MODULE;
pmic->desc[i].enable_reg = pmic->get_ctrl_reg(i);

switch (i) {
case TPS65910_REG_VBB:
if (tps65910_chip_id(tps65910) == TPS65910)
pmic->desc[i].enable_mask = BBCH_BBCHEN_MASK;
else
pmic->desc[i].enable_mask =
TPS65910_SUPPLY_STATE_ENABLED;
break;

default:
pmic->desc[i].enable_mask =
TPS65910_SUPPLY_STATE_ENABLED;
break;
}
pmic->desc[i].enable_mask = TPS65910_SUPPLY_STATE_ENABLED;

config.dev = tps65910->dev;
config.init_data = reg_data;
Expand Down
2 changes: 0 additions & 2 deletions include/linux/mfd/tps65910.h
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,6 @@
/*Register BBCH (0x80) register.RegisterDescription */
#define BBCH_BBSEL_MASK 0x06
#define BBCH_BBSEL_SHIFT 1
#define BBCH_BBCHEN_MASK 0x01
#define BBCH_BBCHEN_SHIFT 0


/*Register DCDCCTRL (0x80) register.RegisterDescription */
Expand Down

0 comments on commit b8903eb

Please sign in to comment.