leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'regulator-5.1' into regulator-linus

Browse Source
This commit is contained in:
Mark Brown 2019-05-06 22:52:12 +09:00
commit c7b5128f72
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/regulator/core.c
View File

@ -2256,6 +2256,7 @@ static void regulator_ena_gpio_free(struct regulator_dev *rdev)
if (pin->gpiod == rdev->ena_pin->gpiod) { if (pin->gpiod == rdev->ena_pin->gpiod) {
if (pin->request_count <= 1) { if (pin->request_count <= 1) {
pin->request_count = 0; pin->request_count = 0;
gpiod_put(pin->gpiod);
list_del(&pin->list); list_del(&pin->list);
kfree(pin); kfree(pin);
rdev->ena_pin = NULL; rdev->ena_pin = NULL;
@ -3322,15 +3323,12 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
/* for not coupled regulators this will just set the voltage */ /* for not coupled regulators this will just set the voltage */
ret = regulator_balance_voltage(rdev, state); ret = regulator_balance_voltage(rdev, state);
if (ret < 0) if (ret < 0) {
goto out2; voltage->min_uV = old_min_uV;
voltage->max_uV = old_max_uV;
}
out: out:
return 0;
out2:
voltage->min_uV = old_min_uV;
voltage->max_uV = old_max_uV;
return ret; return ret;
} }
@ -5064,10 +5062,11 @@ void regulator_unregister(struct regulator_dev *rdev)
regulator_put(rdev->supply); regulator_put(rdev->supply);
} }
flush_work(&rdev->disable_work.work);
mutex_lock(&regulator_list_mutex); mutex_lock(&regulator_list_mutex);
debugfs_remove_recursive(rdev->debugfs); debugfs_remove_recursive(rdev->debugfs);
flush_work(&rdev->disable_work.work);
WARN_ON(rdev->open_count); WARN_ON(rdev->open_count);
regulator_remove_coupling(rdev); regulator_remove_coupling(rdev);
unset_regulator_supplies(rdev); unset_regulator_supplies(rdev);

2
drivers/regulator/max77620-regulator.c
View File

@ -803,7 +803,7 @@ static int max77620_regulator_probe(struct platform_device *pdev)
continue; continue;
rdesc = &rinfo[id].desc; rdesc = &rinfo[id].desc;
pmic->rinfo[id] = &max77620_regs_info[id]; pmic->rinfo[id] = &rinfo[id];
pmic->enable_power_mode[id] = MAX77620_POWER_MODE_NORMAL; pmic->enable_power_mode[id] = MAX77620_POWER_MODE_NORMAL;
pmic->reg_pdata[id].active_fps_src = -1; pmic->reg_pdata[id].active_fps_src = -1;
pmic->reg_pdata[id].active_fps_pd_slot = -1; pmic->reg_pdata[id].active_fps_pd_slot = -1;

2
drivers/regulator/tps65217-regulator.c
View File

@ -61,7 +61,7 @@ static const struct regulator_linear_range tps65217_uv1_ranges[] = {
REGULATOR_LINEAR_RANGE(1550000, 25, 30, 50000), REGULATOR_LINEAR_RANGE(1550000, 25, 30, 50000),
REGULATOR_LINEAR_RANGE(1850000, 31, 52, 50000), REGULATOR_LINEAR_RANGE(1850000, 31, 52, 50000),
REGULATOR_LINEAR_RANGE(3000000, 53, 55, 100000), REGULATOR_LINEAR_RANGE(3000000, 53, 55, 100000),
REGULATOR_LINEAR_RANGE(3300000, 56, 62, 0), REGULATOR_LINEAR_RANGE(3300000, 56, 63, 0),
}; };
static const struct regulator_linear_range tps65217_uv2_ranges[] = { static const struct regulator_linear_range tps65217_uv2_ranges[] = {