* [PATCH v2] regulator: ab8500: Fix set voltage for AB8540_LDO_AUX3
@ 2013-04-16 14:46 Axel Lin
2013-04-17 6:41 ` Bengt Jönsson
0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2013-04-16 14:46 UTC (permalink / raw)
To: Mark Brown
Cc: Bengt Jonsson, Lee Jones, Yvan FILLION, Liam Girdwood,
linux-kernel
When setting voltage for AB8540_LDO_AUX3, current code only updates one of
info->voltage_reg and info->expand_register registers which is wrong.
To ensure we set to correct voltage, it always needs to clear or set
expand_register.voltage_mask bit of expand_register.
The function of the expand register bit is the following (from the user manual):
0: VAUX3 output voltage is determined by Vaux3Sel bit settings in register
VldoCVaux3Sel
1: VAUX3 output voltage is set to 3.05V regardless of Vaux3Sel settings in
register VldoCVaux3Sel (VldoCVaux3Sel is the register at 0x0421)
So when going to 3.05V, set the expand register bit.
When leaving 3.05V for another voltage, set the target voltage before clearing
the expand register bit.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/regulator/ab8500.c | 69 ++++++++++++++++++++++++++++++++------------
1 file changed, 51 insertions(+), 18 deletions(-)
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 0a62ef9..84e064b 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -612,32 +612,65 @@ static int ab8540_aux3_regulator_set_voltage_sel(struct regulator_dev *rdev,
return -EINVAL;
}
+ /* Set the expand register bit for 3.05V.
+ Once expand register bit is set, VAUX3 output voltage is set to 3.05V
+ regardless of Vaux3Sel settings in register VldoCVaux3Sel.
+ */
if (selector >= info->expand_register.voltage_limit) {
- /* Vaux3 bit4 has different layout */
- regval = (u8)selector << info->expand_register.voltage_shift;
- ret = abx500_mask_and_set_register_interruptible(info->dev,
- info->expand_register.voltage_bank,
- info->expand_register.voltage_reg,
- info->expand_register.voltage_mask,
- regval);
- } else {
- /* set the registers for the request */
- regval = (u8)selector << info->voltage_shift;
ret = abx500_mask_and_set_register_interruptible(info->dev,
- info->voltage_bank, info->voltage_reg,
- info->voltage_mask, regval);
+ info->expand_register.voltage_bank,
+ info->expand_register.voltage_reg,
+ info->expand_register.voltage_mask,
+ info->expand_register.voltage_mask);
+ if (ret < 0) {
+ dev_err(rdev_get_dev(rdev),
+ "couldn't set expand voltage reg for regulator\n");
+ return ret;
+ }
+
+ dev_vdbg(rdev_get_dev(rdev),
+ "%s-set_voltage expand (bank, reg, mask, value): 0x%x, 0x%x, 0x%x, 0x%x\n",
+ info->desc.name, info->expand_register.voltage_bank,
+ info->expand_register.voltage_reg,
+ info->expand_register.voltage_mask,
+ info->expand_register.voltage_mask);
+
+ return 0;
}
- if (ret < 0)
+
+ /* Set target voltage before clearing the expand register bit */
+ regval = (u8)selector << info->voltage_shift;
+ ret = abx500_mask_and_set_register_interruptible(info->dev,
+ info->voltage_bank, info->voltage_reg,
+ info->voltage_mask, regval);
+ if (ret < 0) {
dev_err(rdev_get_dev(rdev),
"couldn't set voltage reg for regulator\n");
+ return ret;
+ }
dev_vdbg(rdev_get_dev(rdev),
- "%s-set_voltage (bank, reg, mask, value): 0x%x, 0x%x, 0x%x,"
- " 0x%x\n",
- info->desc.name, info->voltage_bank, info->voltage_reg,
- info->voltage_mask, regval);
+ "%s-set_voltage (bank, reg, mask, value): 0x%x, 0x%x, 0x%x, 0x%x\n",
+ info->desc.name, info->voltage_bank, info->voltage_reg,
+ info->voltage_mask, regval);
- return ret;
+ ret = abx500_mask_and_set_register_interruptible(info->dev,
+ info->expand_register.voltage_bank,
+ info->expand_register.voltage_reg,
+ info->expand_register.voltage_mask, 0);
+ if (ret < 0) {
+ dev_err(rdev_get_dev(rdev),
+ "couldn't clear expand voltage reg for regulator\n");
+ return ret;
+ }
+
+ dev_vdbg(rdev_get_dev(rdev),
+ "%s-set_voltage expand (bank, reg, mask, value): 0x%x, 0x%x, 0x%x, 0x%x\n",
+ info->desc.name, info->expand_register.voltage_bank,
+ info->expand_register.voltage_reg,
+ info->expand_register.voltage_mask, 0);
+
+ return 0;
}
static struct regulator_ops ab8500_regulator_volt_mode_ops = {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] regulator: ab8500: Fix set voltage for AB8540_LDO_AUX3
2013-04-16 14:46 [PATCH v2] regulator: ab8500: Fix set voltage for AB8540_LDO_AUX3 Axel Lin
@ 2013-04-17 6:41 ` Bengt Jönsson
0 siblings, 0 replies; 2+ messages in thread
From: Bengt Jönsson @ 2013-04-17 6:41 UTC (permalink / raw)
To: Axel Lin
Cc: Mark Brown, Lee Jones, Yvan FILLION, Liam Girdwood,
linux-kernel@vger.kernel.org
On 04/16/2013 04:46 PM, Axel Lin wrote:
> When setting voltage for AB8540_LDO_AUX3, current code only updates one of
> info->voltage_reg and info->expand_register registers which is wrong.
> To ensure we set to correct voltage, it always needs to clear or set
> expand_register.voltage_mask bit of expand_register.
>
> The function of the expand register bit is the following (from the user manual):
> 0: VAUX3 output voltage is determined by Vaux3Sel bit settings in register
> VldoCVaux3Sel
> 1: VAUX3 output voltage is set to 3.05V regardless of Vaux3Sel settings in
> register VldoCVaux3Sel (VldoCVaux3Sel is the register at 0x0421)
>
> So when going to 3.05V, set the expand register bit.
> When leaving 3.05V for another voltage, set the target voltage before clearing
> the expand register bit.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
Looks fine.Thanks!
Acked-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
> ---
> drivers/regulator/ab8500.c | 69 ++++++++++++++++++++++++++++++++------------
> 1 file changed, 51 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
> index 0a62ef9..84e064b 100644
> --- a/drivers/regulator/ab8500.c
> +++ b/drivers/regulator/ab8500.c
> @@ -612,32 +612,65 @@ static int ab8540_aux3_regulator_set_voltage_sel(struct regulator_dev *rdev,
> return -EINVAL;
> }
>
> + /* Set the expand register bit for 3.05V.
> + Once expand register bit is set, VAUX3 output voltage is set to 3.05V
> + regardless of Vaux3Sel settings in register VldoCVaux3Sel.
> + */
> if (selector >= info->expand_register.voltage_limit) {
> - /* Vaux3 bit4 has different layout */
> - regval = (u8)selector << info->expand_register.voltage_shift;
> - ret = abx500_mask_and_set_register_interruptible(info->dev,
> - info->expand_register.voltage_bank,
> - info->expand_register.voltage_reg,
> - info->expand_register.voltage_mask,
> - regval);
> - } else {
> - /* set the registers for the request */
> - regval = (u8)selector << info->voltage_shift;
> ret = abx500_mask_and_set_register_interruptible(info->dev,
> - info->voltage_bank, info->voltage_reg,
> - info->voltage_mask, regval);
> + info->expand_register.voltage_bank,
> + info->expand_register.voltage_reg,
> + info->expand_register.voltage_mask,
> + info->expand_register.voltage_mask);
> + if (ret < 0) {
> + dev_err(rdev_get_dev(rdev),
> + "couldn't set expand voltage reg for regulator\n");
> + return ret;
> + }
> +
> + dev_vdbg(rdev_get_dev(rdev),
> + "%s-set_voltage expand (bank, reg, mask, value): 0x%x, 0x%x, 0x%x, 0x%x\n",
> + info->desc.name, info->expand_register.voltage_bank,
> + info->expand_register.voltage_reg,
> + info->expand_register.voltage_mask,
> + info->expand_register.voltage_mask);
> +
> + return 0;
> }
> - if (ret < 0)
> +
> + /* Set target voltage before clearing the expand register bit */
> + regval = (u8)selector << info->voltage_shift;
> + ret = abx500_mask_and_set_register_interruptible(info->dev,
> + info->voltage_bank, info->voltage_reg,
> + info->voltage_mask, regval);
> + if (ret < 0) {
> dev_err(rdev_get_dev(rdev),
> "couldn't set voltage reg for regulator\n");
> + return ret;
> + }
>
> dev_vdbg(rdev_get_dev(rdev),
> - "%s-set_voltage (bank, reg, mask, value): 0x%x, 0x%x, 0x%x,"
> - " 0x%x\n",
> - info->desc.name, info->voltage_bank, info->voltage_reg,
> - info->voltage_mask, regval);
> + "%s-set_voltage (bank, reg, mask, value): 0x%x, 0x%x, 0x%x, 0x%x\n",
> + info->desc.name, info->voltage_bank, info->voltage_reg,
> + info->voltage_mask, regval);
>
> - return ret;
> + ret = abx500_mask_and_set_register_interruptible(info->dev,
> + info->expand_register.voltage_bank,
> + info->expand_register.voltage_reg,
> + info->expand_register.voltage_mask, 0);
> + if (ret < 0) {
> + dev_err(rdev_get_dev(rdev),
> + "couldn't clear expand voltage reg for regulator\n");
> + return ret;
> + }
> +
> + dev_vdbg(rdev_get_dev(rdev),
> + "%s-set_voltage expand (bank, reg, mask, value): 0x%x, 0x%x, 0x%x, 0x%x\n",
> + info->desc.name, info->expand_register.voltage_bank,
> + info->expand_register.voltage_reg,
> + info->expand_register.voltage_mask, 0);
> +
> + return 0;
> }
>
> static struct regulator_ops ab8500_regulator_volt_mode_ops = {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-17 6:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-16 14:46 [PATCH v2] regulator: ab8500: Fix set voltage for AB8540_LDO_AUX3 Axel Lin
2013-04-17 6:41 ` Bengt Jönsson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox