Merge remote-tracking branches 'regulator/fix/bcm590xx', 'regulator/fix/s2m' and 'regulator/fix/s5m8767' into regulator-linus
This commit is contained in:
commit
039df7a7cb
|
@ -123,6 +123,7 @@ struct bcm590xx_info {
|
|||
#define BCM590XX_REG_RANGES(_name, _ranges) \
|
||||
{ \
|
||||
.name = #_name, \
|
||||
.n_voltages = 64, \
|
||||
.n_linear_ranges = ARRAY_SIZE(_ranges), \
|
||||
.linear_ranges = _ranges, \
|
||||
}
|
||||
|
|
|
@ -192,13 +192,11 @@ static int s2mpa01_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
|
|||
if (!ramp_enable)
|
||||
goto ramp_disable;
|
||||
|
||||
if (enable_shift) {
|
||||
ret = regmap_update_bits(rdev->regmap, S2MPA01_REG_RAMP1,
|
||||
1 << enable_shift, 1 << enable_shift);
|
||||
if (ret) {
|
||||
dev_err(&rdev->dev, "failed to enable ramp rate\n");
|
||||
return ret;
|
||||
}
|
||||
ret = regmap_update_bits(rdev->regmap, S2MPA01_REG_RAMP1,
|
||||
1 << enable_shift, 1 << enable_shift);
|
||||
if (ret) {
|
||||
dev_err(&rdev->dev, "failed to enable ramp rate\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
ramp_val = get_ramp_delay(ramp_delay);
|
||||
|
|
|
@ -202,13 +202,11 @@ static int s2mps11_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
|
|||
if (!ramp_enable)
|
||||
goto ramp_disable;
|
||||
|
||||
if (enable_shift) {
|
||||
ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
|
||||
1 << enable_shift, 1 << enable_shift);
|
||||
if (ret) {
|
||||
dev_err(&rdev->dev, "failed to enable ramp rate\n");
|
||||
return ret;
|
||||
}
|
||||
ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
|
||||
1 << enable_shift, 1 << enable_shift);
|
||||
if (ret) {
|
||||
dev_err(&rdev->dev, "failed to enable ramp rate\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
ramp_val = get_ramp_delay(ramp_delay);
|
||||
|
|
|
@ -964,6 +964,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
|
|||
config.driver_data = s5m8767;
|
||||
config.regmap = iodev->regmap_pmic;
|
||||
config.of_node = pdata->regulators[i].reg_node;
|
||||
config.ena_gpio = config.ena_gpio_flags = 0;
|
||||
if (pdata->regulators[i].ext_control_gpio)
|
||||
s5m8767_regulator_config_ext_control(s5m8767,
|
||||
&pdata->regulators[i], &config);
|
||||
|
|
Loading…
Reference in a new issue