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

Commit 64db657b authored by Danny Huang's avatar Danny Huang Committed by Liam Girdwood
Browse files

regulator: tps6586x: Fix TPS6586X_DVM to store goreg/bit 



Change-Id: Idacf5e1e51dbbbcd5ea93f310a4e907977e7359e
Signed-off-by: default avatarDanny Huang <dahuang@nvidia.com>
Signed-off-by: default avatarOlof Johansson <olofj@chromium.org>
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
  (Split into separate patches)
  (Minor formatting fixes)
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 4f586707

drivers/regulator/tps6586x-regulator.c

+13 −6
Original line number Diff line number Diff line
@@ -231,8 +231,7 @@ static int tps6586x_dvm_voltages[] = { 
};



#define TPS6586X_REGULATOR(_id, vdata, _ops, vreg, shift, nbits,	\

			   ereg0, ebit0, ereg1, ebit1, goreg, gobit)	\

{									\

			   ereg0, ebit0, ereg1, ebit1)			\

	.desc	= {							\

		.name	= "REG-" #_id,					\

		.ops	= &tps6586x_regulator_##_ops,			\
@@ -248,18 +247,26 @@ static int tps6586x_dvm_voltages[] = { 
	.enable_bit[0]	= (ebit0),					\

	.enable_reg[1]	= TPS6586X_SUPPLY##ereg1,			\

	.enable_bit[1]	= (ebit1),					\

	.voltages	= tps6586x_##vdata##_voltages,			\

}

	.voltages	= tps6586x_##vdata##_voltages,



#define TPS6586X_REGULATOR_DVM_GOREG(goreg, gobit)			\

	.go_reg = TPS6586X_##goreg,					\

	.go_bit = (gobit),



#define TPS6586X_LDO(_id, vdata, vreg, shift, nbits,			\

		     ereg0, ebit0, ereg1, ebit1)			\

{									\

	TPS6586X_REGULATOR(_id, vdata, ldo_ops, vreg, shift, nbits,	\

			   ereg0, ebit0, ereg1, ebit1, 0, 0)

			   ereg0, ebit0, ereg1, ebit1)			\

}



#define TPS6586X_DVM(_id, vdata, vreg, shift, nbits,			\

		     ereg0, ebit0, ereg1, ebit1, goreg, gobit)		\

{									\

	TPS6586X_REGULATOR(_id, vdata, dvm_ops, vreg, shift, nbits,	\

			   ereg0, ebit0, ereg1, ebit1, goreg, gobit)

			   ereg0, ebit0, ereg1, ebit1)			\

	TPS6586X_REGULATOR_DVM_GOREG(goreg, gobit)			\

}



static struct tps6586x_regulator tps6586x_regulator[] = {

	TPS6586X_LDO(LDO_0, ldo, SUPPLYV1, 5, 3, ENC, 0, END, 0),