aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2014-12-11 08:40:21 -0500
committerMark Brown <broonie@kernel.org>2014-12-12 08:04:39 -0500
commit1222d8fe578cd28a6c7f5e4e6c6b664c56abfdc0 (patch)
tree66732c12ba096693cdeed313c615d94d7e42de34 /drivers/regulator
parentb2776bf7149bddd1f4161f14f79520f17fc1d71d (diff)
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: 5a867cf28893 ("regulator: s2mps11: Optimize the regulator description macro") Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: <stable@vger.kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/s2mps11.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index adab82d5279f..697be114e21a 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -479,7 +479,7 @@ static struct regulator_ops s2mps14_reg_ops = {
479 .enable_mask = S2MPS14_ENABLE_MASK \ 479 .enable_mask = S2MPS14_ENABLE_MASK \
480} 480}
481 481
482#define regulator_desc_s2mps14_buck(num, min, step) { \ 482#define regulator_desc_s2mps14_buck(num, min, step, min_sel) { \
483 .name = "BUCK"#num, \ 483 .name = "BUCK"#num, \
484 .id = S2MPS14_BUCK##num, \ 484 .id = S2MPS14_BUCK##num, \
485 .ops = &s2mps14_reg_ops, \ 485 .ops = &s2mps14_reg_ops, \
@@ -488,7 +488,7 @@ static struct regulator_ops s2mps14_reg_ops = {
488 .min_uV = min, \ 488 .min_uV = min, \
489 .uV_step = step, \ 489 .uV_step = step, \
490 .n_voltages = S2MPS14_BUCK_N_VOLTAGES, \ 490 .n_voltages = S2MPS14_BUCK_N_VOLTAGES, \
491 .linear_min_sel = S2MPS14_BUCK1235_START_SEL, \ 491 .linear_min_sel = min_sel, \
492 .ramp_delay = S2MPS14_BUCK_RAMP_DELAY, \ 492 .ramp_delay = S2MPS14_BUCK_RAMP_DELAY, \
493 .vsel_reg = S2MPS14_REG_B1CTRL2 + (num - 1) * 2, \ 493 .vsel_reg = S2MPS14_REG_B1CTRL2 + (num - 1) * 2, \
494 .vsel_mask = S2MPS14_BUCK_VSEL_MASK, \ 494 .vsel_mask = S2MPS14_BUCK_VSEL_MASK, \
@@ -522,11 +522,16 @@ static const struct regulator_desc s2mps14_regulators[] = {
522 regulator_desc_s2mps14_ldo(23, MIN_800_MV, STEP_25_MV), 522 regulator_desc_s2mps14_ldo(23, MIN_800_MV, STEP_25_MV),
523 regulator_desc_s2mps14_ldo(24, MIN_1800_MV, STEP_25_MV), 523 regulator_desc_s2mps14_ldo(24, MIN_1800_MV, STEP_25_MV),
524 regulator_desc_s2mps14_ldo(25, MIN_1800_MV, STEP_25_MV), 524 regulator_desc_s2mps14_ldo(25, MIN_1800_MV, STEP_25_MV),
525 regulator_desc_s2mps14_buck(1, MIN_600_MV, STEP_6_25_MV), 525 regulator_desc_s2mps14_buck(1, MIN_600_MV, STEP_6_25_MV,
526 regulator_desc_s2mps14_buck(2, MIN_600_MV, STEP_6_25_MV), 526 S2MPS14_BUCK1235_START_SEL),
527 regulator_desc_s2mps14_buck(3, MIN_600_MV, STEP_6_25_MV), 527 regulator_desc_s2mps14_buck(2, MIN_600_MV, STEP_6_25_MV,
528 regulator_desc_s2mps14_buck(4, MIN_1400_MV, STEP_12_5_MV), 528 S2MPS14_BUCK1235_START_SEL),
529 regulator_desc_s2mps14_buck(5, MIN_600_MV, STEP_6_25_MV), 529 regulator_desc_s2mps14_buck(3, MIN_600_MV, STEP_6_25_MV,
530 S2MPS14_BUCK1235_START_SEL),
531 regulator_desc_s2mps14_buck(4, MIN_1400_MV, STEP_12_5_MV,
532 S2MPS14_BUCK4_START_SEL),
533 regulator_desc_s2mps14_buck(5, MIN_600_MV, STEP_6_25_MV,
534 S2MPS14_BUCK1235_START_SEL),
530}; 535};
531 536
532static int s2mps14_pmic_enable_ext_control(struct s2mps11_info *s2mps11, 537static int s2mps14_pmic_enable_ext_control(struct s2mps11_info *s2mps11,