Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit c0c4cf06456d4fffc45cb618a1a7af1e5861cbc8

Authored by Linus Torvalds
2 parents 4b44e7b135 039df7a7cb
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, 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, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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

Pull regulator fixes from Mark Brown:
 "A few driver specific fixes that have come in over the merge window,
  all only relevant for the specific driver"

* tag 'regulator-v3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: bcm590xx: Set n_voltages for linear reg
  regulator: s5m8767: Fix carried over ena_gpio assignment
  regulator: s2mps11: Don't check enable_shift before setting enable ramp rate
  regulator: s2mpa01: Don't check enable_shift before setting enable ramp rate

Showing 4 changed files Side-by-side Diff

drivers/regulator/bcm590xx-regulator.c
Diff comments   View file @ c0c4cf0
... ... @@ -123,6 +123,7 @@
123 123 #define BCM590XX_REG_RANGES(_name, _ranges) \
124 124 { \
125 125 .name = #_name, \
  126 + .n_voltages = 64, \
126 127 .n_linear_ranges = ARRAY_SIZE(_ranges), \
127 128 .linear_ranges = _ranges, \
128 129 }
drivers/regulator/s2mpa01.c
Diff comments   View file @ c0c4cf0
... ... @@ -192,13 +192,11 @@
192 192 if (!ramp_enable)
193 193 goto ramp_disable;
194 194  
195   - if (enable_shift) {
196   - ret = regmap_update_bits(rdev->regmap, S2MPA01_REG_RAMP1,
197   - 1 << enable_shift, 1 << enable_shift);
198   - if (ret) {
199   - dev_err(&rdev->dev, "failed to enable ramp rate\n");
200   - return ret;
201   - }
  195 + ret = regmap_update_bits(rdev->regmap, S2MPA01_REG_RAMP1,
  196 + 1 << enable_shift, 1 << enable_shift);
  197 + if (ret) {
  198 + dev_err(&rdev->dev, "failed to enable ramp rate\n");
  199 + return ret;
202 200 }
203 201  
204 202 ramp_val = get_ramp_delay(ramp_delay);
drivers/regulator/s2mps11.c
Diff comments   View file @ c0c4cf0
... ... @@ -202,13 +202,11 @@
202 202 if (!ramp_enable)
203 203 goto ramp_disable;
204 204  
205   - if (enable_shift) {
206   - ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
207   - 1 << enable_shift, 1 << enable_shift);
208   - if (ret) {
209   - dev_err(&rdev->dev, "failed to enable ramp rate\n");
210   - return ret;
211   - }
  205 + ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
  206 + 1 << enable_shift, 1 << enable_shift);
  207 + if (ret) {
  208 + dev_err(&rdev->dev, "failed to enable ramp rate\n");
  209 + return ret;
212 210 }
213 211  
214 212 ramp_val = get_ramp_delay(ramp_delay);
drivers/regulator/s5m8767.c
Diff comments   View file @ c0c4cf0
... ... @@ -964,6 +964,7 @@
964 964 config.driver_data = s5m8767;
965 965 config.regmap = iodev->regmap_pmic;
966 966 config.of_node = pdata->regulators[i].reg_node;
  967 + config.ena_gpio = config.ena_gpio_flags = 0;
967 968 if (pdata->regulators[i].ext_control_gpio)
968 969 s5m8767_regulator_config_ext_control(s5m8767,
969 970 &pdata->regulators[i], &config);