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

Commit 1222d8fe authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

regulator: s2mps11: Fix dw_mmc failure on Gear 2 



Invalid buck4 configuration for linear mapping of voltage in S2MPS14
regulators caused boot failure on Gear 2 (dw_mmc-exynos):

[    3.569137] EXT4-fs (mmcblk0p15): mounted filesystem with ordered data mode. Opts: (null)
[    3.571716] VFS: Mounted root (ext4 filesystem) readonly on device 179:15.
[    3.629842] mmcblk0: error -110 sending status command, retrying
[    3.630244] mmcblk0: error -110 sending status command, retrying
[    3.636292] mmcblk0: error -110 sending status command, aborting

Buck4 voltage regulator has different minimal voltage value than other
bucks. Commit merging multiple regulator description macros caused to
use linear_min_sel from buck[1235] regulators as value for buck4. This
lead to lower voltage of buck4 than required.

Output of the buck4 is used internally as power source for
LDO{3,4,7,11,19,20,21,23}. On Gear 2 board LDO11 is used as MMC
regulator (V_EMMC_1.8V).

Fixes: 5a867cf2 ("regulator: s2mps11: Optimize the regulator description macro")
Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: <stable@vger.kernel.org>
parent b2776bf7

drivers/regulator/s2mps11.c

+12 −7
Original line number Diff line number Diff line
@@ -479,7 +479,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,			\
@@ -488,7 +488,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,		\
@@ -522,11 +522,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,