Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8903eb9 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: tps65910: Simplify setting enable_mask for regulators 



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: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 03746dcb

drivers/regulator/tps65910-regulator.c

+1 −15
Original line number Diff line number Diff line
@@ -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;

include/linux/mfd/tps65910.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */