Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 034496f40d64a4de786dfd39aa607d120c8c3cfc

Authored by Linus Torvalds
2 parents 5e6c2c97c5 1222d8fe57
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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

Showing 1 changed file Side-by-side Diff

drivers/regulator/s2mps11.c
Diff comments   View file @ 034496f
... ... @@ -570,7 +570,7 @@
570 570 .enable_mask = S2MPS14_ENABLE_MASK \
571 571 }
572 572  
573   -#define regulator_desc_s2mps14_buck(num, min, step) { \
  573 +#define regulator_desc_s2mps14_buck(num, min, step, min_sel) { \
574 574 .name = "BUCK"#num, \
575 575 .id = S2MPS14_BUCK##num, \
576 576 .ops = &s2mps14_reg_ops, \
... ... @@ -579,7 +579,7 @@
579 579 .min_uV = min, \
580 580 .uV_step = step, \
581 581 .n_voltages = S2MPS14_BUCK_N_VOLTAGES, \
582   - .linear_min_sel = S2MPS14_BUCK1235_START_SEL, \
  582 + .linear_min_sel = min_sel, \
583 583 .ramp_delay = S2MPS14_BUCK_RAMP_DELAY, \
584 584 .vsel_reg = S2MPS14_REG_B1CTRL2 + (num - 1) * 2, \
585 585 .vsel_mask = S2MPS14_BUCK_VSEL_MASK, \
... ... @@ -613,11 +613,16 @@
613 613 regulator_desc_s2mps14_ldo(23, MIN_800_MV, STEP_25_MV),
614 614 regulator_desc_s2mps14_ldo(24, MIN_1800_MV, STEP_25_MV),
615 615 regulator_desc_s2mps14_ldo(25, MIN_1800_MV, STEP_25_MV),
616   - regulator_desc_s2mps14_buck(1, MIN_600_MV, STEP_6_25_MV),
617   - regulator_desc_s2mps14_buck(2, MIN_600_MV, STEP_6_25_MV),
618   - regulator_desc_s2mps14_buck(3, MIN_600_MV, STEP_6_25_MV),
619   - regulator_desc_s2mps14_buck(4, MIN_1400_MV, STEP_12_5_MV),
620   - regulator_desc_s2mps14_buck(5, MIN_600_MV, STEP_6_25_MV),
  616 + regulator_desc_s2mps14_buck(1, MIN_600_MV, STEP_6_25_MV,
  617 + S2MPS14_BUCK1235_START_SEL),
  618 + regulator_desc_s2mps14_buck(2, MIN_600_MV, STEP_6_25_MV,
  619 + S2MPS14_BUCK1235_START_SEL),
  620 + regulator_desc_s2mps14_buck(3, MIN_600_MV, STEP_6_25_MV,
  621 + S2MPS14_BUCK1235_START_SEL),
  622 + regulator_desc_s2mps14_buck(4, MIN_1400_MV, STEP_12_5_MV,
  623 + S2MPS14_BUCK4_START_SEL),
  624 + regulator_desc_s2mps14_buck(5, MIN_600_MV, STEP_6_25_MV,
  625 + S2MPS14_BUCK1235_START_SEL),
621 626 };
622 627  
623 628 static int s2mps14_pmic_enable_ext_control(struct s2mps11_info *s2mps11,