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

Commit 353495a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  regulator: tps6586x: correct register table
  regulator: tps6586x: Handle both enable reg/bits being the same
  regulator: tps6586x: Fix TPS6586X_DVM to store goreg/bit
  regulator: tps6586x: Add missing bit mask generation
parents f9ae3e12 1b39ed0c

drivers/regulator/tps6586x-regulator.c

+22 −11
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),
@@ -267,11 +274,11 @@ static struct tps6586x_regulator tps6586x_regulator[] = { 
	TPS6586X_LDO(LDO_5, ldo, SUPPLYV6, 0, 3, ENE, 6, ENE, 6),

	TPS6586X_LDO(LDO_6, ldo, SUPPLYV3, 0, 3, ENC, 4, END, 4),

	TPS6586X_LDO(LDO_7, ldo, SUPPLYV3, 3, 3, ENC, 5, END, 5),

	TPS6586X_LDO(LDO_8, ldo, SUPPLYV1, 5, 3, ENC, 6, END, 6),

	TPS6586X_LDO(LDO_8, ldo, SUPPLYV2, 5, 3, ENC, 6, END, 6),

	TPS6586X_LDO(LDO_9, ldo, SUPPLYV6, 3, 3, ENE, 7, ENE, 7),

	TPS6586X_LDO(LDO_RTC, ldo, SUPPLYV4, 3, 3, ENE, 7, ENE, 7),

	TPS6586X_LDO(LDO_RTC, ldo, SUPPLYV4, 3, 3, V4, 7, V4, 7),

	TPS6586X_LDO(LDO_1, dvm, SUPPLYV1, 0, 5, ENC, 1, END, 1),

	TPS6586X_LDO(SM_2, sm2, SUPPLYV2, 0, 5, ENC, 1, END, 1),

	TPS6586X_LDO(SM_2, sm2, SUPPLYV2, 0, 5, ENC, 7, END, 7),



	TPS6586X_DVM(LDO_2, dvm, LDO2BV1, 0, 5, ENA, 3, ENB, 3, VCC2, 6),

	TPS6586X_DVM(LDO_4, ldo4, LDO4V1, 0, 5, ENC, 3, END, 3, VCC1, 6),
@@ -290,6 +297,10 @@ static inline int tps6586x_regulator_preinit(struct device *parent, 
	uint8_t val1, val2;

	int ret;



	if (ri->enable_reg[0] == ri->enable_reg[1] &&

	    ri->enable_bit[0] == ri->enable_bit[1])

			return 0;



	ret = tps6586x_read(parent, ri->enable_reg[0], &val1);

	if (ret)

		return ret;
@@ -298,14 +309,14 @@ static inline int tps6586x_regulator_preinit(struct device *parent, 
	if (ret)

		return ret;



	if (!(val2 & ri->enable_bit[1]))

	if (!(val2 & (1 << ri->enable_bit[1])))

		return 0;



	/*

	 * The regulator is on, but it's enabled with the bit we don't

	 * want to use, so we switch the enable bits

	 */

	if (!(val1 & ri->enable_bit[0])) {

	if (!(val1 & (1 << ri->enable_bit[0]))) {

		ret = tps6586x_set_bits(parent, ri->enable_reg[0],

					1 << ri->enable_bit[0]);

		if (ret)