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

Commit 034496f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator 

Pull one regulator fix from Mark Brown:
 "One fix here, a fix for the voltage mapping on one of the s2mps11
  regulators which broke systems using it including apparently the
  Gear 2 smartwatches"

* tag 'regulator-v3.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: s2mps11: Fix dw_mmc failure on Gear 2
parents 5e6c2c97 1222d8fe

drivers/regulator/s2mps11.c

+12 −7
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ static struct regulator_ops s2mps14_reg_ops = { 
	.enable_mask	= S2MPS14_ENABLE_MASK		\

}



#define regulator_desc_s2mps14_buck(num, min, step) {		\

#define regulator_desc_s2mps14_buck(num, min, step, min_sel) {	\

	.name		= "BUCK"#num,				\

	.id		= S2MPS14_BUCK##num,			\

	.ops		= &s2mps14_reg_ops,			\
@@ -579,7 +579,7 @@ static struct regulator_ops s2mps14_reg_ops = { 
	.min_uV		= min,					\

	.uV_step	= step,					\

	.n_voltages	= S2MPS14_BUCK_N_VOLTAGES,		\

	.linear_min_sel = S2MPS14_BUCK1235_START_SEL,		\

	.linear_min_sel = min_sel,				\

	.ramp_delay	= S2MPS14_BUCK_RAMP_DELAY,		\

	.vsel_reg	= S2MPS14_REG_B1CTRL2 + (num - 1) * 2,	\

	.vsel_mask	= S2MPS14_BUCK_VSEL_MASK,		\
@@ -613,11 +613,16 @@ static const struct regulator_desc s2mps14_regulators[] = { 
	regulator_desc_s2mps14_ldo(23, MIN_800_MV, STEP_25_MV),

	regulator_desc_s2mps14_ldo(24, MIN_1800_MV, STEP_25_MV),

	regulator_desc_s2mps14_ldo(25, MIN_1800_MV, STEP_25_MV),

	regulator_desc_s2mps14_buck(1, MIN_600_MV, STEP_6_25_MV),

	regulator_desc_s2mps14_buck(2, MIN_600_MV, STEP_6_25_MV),

	regulator_desc_s2mps14_buck(3, MIN_600_MV, STEP_6_25_MV),

	regulator_desc_s2mps14_buck(4, MIN_1400_MV, STEP_12_5_MV),

	regulator_desc_s2mps14_buck(5, MIN_600_MV, STEP_6_25_MV),

	regulator_desc_s2mps14_buck(1, MIN_600_MV, STEP_6_25_MV,

				    S2MPS14_BUCK1235_START_SEL),

	regulator_desc_s2mps14_buck(2, MIN_600_MV, STEP_6_25_MV,

				    S2MPS14_BUCK1235_START_SEL),

	regulator_desc_s2mps14_buck(3, MIN_600_MV, STEP_6_25_MV,

				    S2MPS14_BUCK1235_START_SEL),

	regulator_desc_s2mps14_buck(4, MIN_1400_MV, STEP_12_5_MV,

				    S2MPS14_BUCK4_START_SEL),

	regulator_desc_s2mps14_buck(5, MIN_600_MV, STEP_6_25_MV,

				    S2MPS14_BUCK1235_START_SEL),

};



static int s2mps14_pmic_enable_ext_control(struct s2mps11_info *s2mps11,