Commit c0c4cf06 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regulator-v3.15-fixes' of...

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
parents 4b44e7b1 039df7a7
...@@ -123,6 +123,7 @@ struct bcm590xx_info { ...@@ -123,6 +123,7 @@ struct bcm590xx_info {
#define BCM590XX_REG_RANGES(_name, _ranges) \ #define BCM590XX_REG_RANGES(_name, _ranges) \
{ \ { \
.name = #_name, \ .name = #_name, \
.n_voltages = 64, \
.n_linear_ranges = ARRAY_SIZE(_ranges), \ .n_linear_ranges = ARRAY_SIZE(_ranges), \
.linear_ranges = _ranges, \ .linear_ranges = _ranges, \
} }
......
...@@ -192,14 +192,12 @@ static int s2mpa01_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay) ...@@ -192,14 +192,12 @@ static int s2mpa01_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
if (!ramp_enable) if (!ramp_enable)
goto ramp_disable; goto ramp_disable;
if (enable_shift) {
ret = regmap_update_bits(rdev->regmap, S2MPA01_REG_RAMP1, ret = regmap_update_bits(rdev->regmap, S2MPA01_REG_RAMP1,
1 << enable_shift, 1 << enable_shift); 1 << enable_shift, 1 << enable_shift);
if (ret) { if (ret) {
dev_err(&rdev->dev, "failed to enable ramp rate\n"); dev_err(&rdev->dev, "failed to enable ramp rate\n");
return ret; return ret;
} }
}
ramp_val = get_ramp_delay(ramp_delay); ramp_val = get_ramp_delay(ramp_delay);
......
...@@ -202,14 +202,12 @@ static int s2mps11_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay) ...@@ -202,14 +202,12 @@ static int s2mps11_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
if (!ramp_enable) if (!ramp_enable)
goto ramp_disable; goto ramp_disable;
if (enable_shift) {
ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP, ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
1 << enable_shift, 1 << enable_shift); 1 << enable_shift, 1 << enable_shift);
if (ret) { if (ret) {
dev_err(&rdev->dev, "failed to enable ramp rate\n"); dev_err(&rdev->dev, "failed to enable ramp rate\n");
return ret; return ret;
} }
}
ramp_val = get_ramp_delay(ramp_delay); ramp_val = get_ramp_delay(ramp_delay);
......
...@@ -964,6 +964,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev) ...@@ -964,6 +964,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
config.driver_data = s5m8767; config.driver_data = s5m8767;
config.regmap = iodev->regmap_pmic; config.regmap = iodev->regmap_pmic;
config.of_node = pdata->regulators[i].reg_node; config.of_node = pdata->regulators[i].reg_node;
config.ena_gpio = config.ena_gpio_flags = 0;
if (pdata->regulators[i].ext_control_gpio) if (pdata->regulators[i].ext_control_gpio)
s5m8767_regulator_config_ext_control(s5m8767, s5m8767_regulator_config_ext_control(s5m8767,
&pdata->regulators[i], &config); &pdata->regulators[i], &config);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment