Merge remote-tracking branches 'regulator/topic/s5m8767' and 'regulator/topic/vexpress' into regulator-next
This commit is contained in:
commit
768e66686c
|
@ -101,7 +101,7 @@ obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o
|
||||||
obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o
|
obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o
|
||||||
obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o
|
obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o
|
||||||
obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
|
obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
|
||||||
obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress.o
|
obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress-regulator.o
|
||||||
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
|
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
|
||||||
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
|
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
|
||||||
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o
|
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o
|
||||||
|
|
|
@ -202,9 +202,10 @@ static int s5m8767_get_register(struct s5m8767_info *s5m8767, int reg_id,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i < s5m8767->num_regulators)
|
if (i >= s5m8767->num_regulators)
|
||||||
*enable_ctrl =
|
return -EINVAL;
|
||||||
s5m8767_opmode_reg[reg_id][mode] << S5M8767_ENCTRL_SHIFT;
|
|
||||||
|
*enable_ctrl = s5m8767_opmode_reg[reg_id][mode] << S5M8767_ENCTRL_SHIFT;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -937,8 +938,12 @@ static int s5m8767_pmic_probe(struct platform_device *pdev)
|
||||||
else
|
else
|
||||||
regulators[id].vsel_mask = 0xff;
|
regulators[id].vsel_mask = 0xff;
|
||||||
|
|
||||||
s5m8767_get_register(s5m8767, id, &enable_reg,
|
ret = s5m8767_get_register(s5m8767, id, &enable_reg,
|
||||||
&enable_val);
|
&enable_val);
|
||||||
|
if (ret) {
|
||||||
|
dev_err(s5m8767->dev, "error reading registers\n");
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
regulators[id].enable_reg = enable_reg;
|
regulators[id].enable_reg = enable_reg;
|
||||||
regulators[id].enable_mask = S5M8767_ENCTRL_MASK;
|
regulators[id].enable_mask = S5M8767_ENCTRL_MASK;
|
||||||
regulators[id].enable_val = enable_val;
|
regulators[id].enable_val = enable_val;
|
||||||
|
|
Loading…
Reference in a new issue