mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 22:54:01 +00:00
Merge remote-tracking branches 'regulator/fix/da9063', 'regulator/fix/max14577' and 'regulator/fix/s5m8767' into regulator-linus
This commit is contained in:
commit
bcad2ca372
3 changed files with 9 additions and 4 deletions
|
@ -1,3 +1,4 @@
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Regulator driver for DA9063 PMIC series
|
* Regulator driver for DA9063 PMIC series
|
||||||
*
|
*
|
||||||
|
@ -60,7 +61,8 @@ struct da9063_regulator_info {
|
||||||
.desc.ops = &da9063_ldo_ops, \
|
.desc.ops = &da9063_ldo_ops, \
|
||||||
.desc.min_uV = (min_mV) * 1000, \
|
.desc.min_uV = (min_mV) * 1000, \
|
||||||
.desc.uV_step = (step_mV) * 1000, \
|
.desc.uV_step = (step_mV) * 1000, \
|
||||||
.desc.n_voltages = (((max_mV) - (min_mV))/(step_mV) + 1), \
|
.desc.n_voltages = (((max_mV) - (min_mV))/(step_mV) + 1 \
|
||||||
|
+ (DA9063_V##regl_name##_BIAS)), \
|
||||||
.desc.enable_reg = DA9063_REG_##regl_name##_CONT, \
|
.desc.enable_reg = DA9063_REG_##regl_name##_CONT, \
|
||||||
.desc.enable_mask = DA9063_LDO_EN, \
|
.desc.enable_mask = DA9063_LDO_EN, \
|
||||||
.desc.vsel_reg = DA9063_REG_V##regl_name##_A, \
|
.desc.vsel_reg = DA9063_REG_V##regl_name##_A, \
|
||||||
|
|
|
@ -166,9 +166,10 @@ static int max14577_regulator_dt_parse_pdata(struct platform_device *pdev)
|
||||||
|
|
||||||
ret = of_regulator_match(&pdev->dev, np, max14577_regulator_matches,
|
ret = of_regulator_match(&pdev->dev, np, max14577_regulator_matches,
|
||||||
MAX14577_REG_MAX);
|
MAX14577_REG_MAX);
|
||||||
if (ret < 0) {
|
if (ret < 0)
|
||||||
dev_err(&pdev->dev, "Error parsing regulator init data: %d\n", ret);
|
dev_err(&pdev->dev, "Error parsing regulator init data: %d\n", ret);
|
||||||
}
|
else
|
||||||
|
ret = 0;
|
||||||
|
|
||||||
of_node_put(np);
|
of_node_put(np);
|
||||||
|
|
||||||
|
|
|
@ -535,7 +535,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
regulators_np = of_find_node_by_name(pmic_np, "regulators");
|
regulators_np = of_get_child_by_name(pmic_np, "regulators");
|
||||||
if (!regulators_np) {
|
if (!regulators_np) {
|
||||||
dev_err(iodev->dev, "could not find regulators sub-node\n");
|
dev_err(iodev->dev, "could not find regulators sub-node\n");
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -591,6 +591,8 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
|
||||||
rmode++;
|
rmode++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
of_node_put(regulators_np);
|
||||||
|
|
||||||
if (of_get_property(pmic_np, "s5m8767,pmic-buck2-uses-gpio-dvs", NULL)) {
|
if (of_get_property(pmic_np, "s5m8767,pmic-buck2-uses-gpio-dvs", NULL)) {
|
||||||
pdata->buck2_gpiodvs = true;
|
pdata->buck2_gpiodvs = true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue