* [PATCH] regulator: max8973: Don't override control1 variable when set ramp delay bits
@ 2013-04-23 16:14 Axel Lin
2013-04-24 6:05 ` Laxman Dewangan
2013-04-24 9:53 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Axel Lin @ 2013-04-23 16:14 UTC (permalink / raw)
To: Mark Brown; +Cc: Liam Girdwood, linux-kernel, Laxman Dewangan
Current code overrides control1 variable when setting ramp delay bits.
Fix it by just setting ramp_delay bits.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/regulator/max8973-regulator.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
index 9a8ea91..adb1414 100644
--- a/drivers/regulator/max8973-regulator.c
+++ b/drivers/regulator/max8973-regulator.c
@@ -274,15 +274,15 @@ static int max8973_init_dcdc(struct max8973_chip *max,
if (pdata->reg_init_data &&
pdata->reg_init_data->constraints.ramp_delay) {
if (pdata->reg_init_data->constraints.ramp_delay < 25000)
- control1 = MAX8973_RAMP_12mV_PER_US;
+ control1 |= MAX8973_RAMP_12mV_PER_US;
else if (pdata->reg_init_data->constraints.ramp_delay < 50000)
- control1 = MAX8973_RAMP_25mV_PER_US;
+ control1 |= MAX8973_RAMP_25mV_PER_US;
else if (pdata->reg_init_data->constraints.ramp_delay < 200000)
- control1 = MAX8973_RAMP_50mV_PER_US;
+ control1 |= MAX8973_RAMP_50mV_PER_US;
else
- control1 = MAX8973_RAMP_200mV_PER_US;
+ control1 |= MAX8973_RAMP_200mV_PER_US;
} else {
- control1 = MAX8973_RAMP_12mV_PER_US;
+ control1 |= MAX8973_RAMP_12mV_PER_US;
max->desc.ramp_delay = 12500;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] regulator: max8973: Don't override control1 variable when set ramp delay bits
2013-04-23 16:14 [PATCH] regulator: max8973: Don't override control1 variable when set ramp delay bits Axel Lin
@ 2013-04-24 6:05 ` Laxman Dewangan
2013-04-24 9:53 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Laxman Dewangan @ 2013-04-24 6:05 UTC (permalink / raw)
To: Axel Lin; +Cc: Mark Brown, Liam Girdwood, linux-kernel@vger.kernel.org
On Tuesday 23 April 2013 09:44 PM, Axel Lin wrote:
> Current code overrides control1 variable when setting ramp delay bits.
> Fix it by just setting ramp_delay bits.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Laxman Dewangan<ldewangan@nvidia.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] regulator: max8973: Don't override control1 variable when set ramp delay bits
2013-04-23 16:14 [PATCH] regulator: max8973: Don't override control1 variable when set ramp delay bits Axel Lin
2013-04-24 6:05 ` Laxman Dewangan
@ 2013-04-24 9:53 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2013-04-24 9:53 UTC (permalink / raw)
To: Axel Lin; +Cc: Liam Girdwood, linux-kernel, Laxman Dewangan
[-- Attachment #1: Type: text/plain, Size: 296 bytes --]
On Wed, Apr 24, 2013 at 12:14:55AM +0800, Axel Lin wrote:
> Current code overrides control1 variable when setting ramp delay bits.
> Fix it by just setting ramp_delay bits.
Applied, thanks. Laxman, please check your acks can be cut'n'pasted -
there's regularly things I need to fix up by hand.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-24 9:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-23 16:14 [PATCH] regulator: max8973: Don't override control1 variable when set ramp delay bits Axel Lin
2013-04-24 6:05 ` Laxman Dewangan
2013-04-24 9:53 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox