* [PATCH] mfd: Correct revision display for WM1811 revision D
@ 2011-11-30 16:52 Mark Brown
2011-12-12 15:15 ` Samuel Ortiz
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2011-11-30 16:52 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: linux-kernel, patches, Mark Brown
As WM1811 revision C was transparent to software the revision IDs for
subsequent revisions are one less than they would normally be. Correct
for this in log messages.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
I can fold this and other updates into the big regmap changes I posted
the other day if that's helpful?
drivers/mfd/wm8994-core.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 5633fe4..f49b1ac 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -460,6 +460,11 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
break;
}
break;
+ case WM1811:
+ /* Revision C did not change the relevant layer */
+ if (ret > 1)
+ ret++;
+ break;
default:
break;
}
--
1.7.7.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mfd: Correct revision display for WM1811 revision D
2011-11-30 16:52 [PATCH] mfd: Correct revision display for WM1811 revision D Mark Brown
@ 2011-12-12 15:15 ` Samuel Ortiz
2011-12-12 16:04 ` Mark Brown
0 siblings, 1 reply; 3+ messages in thread
From: Samuel Ortiz @ 2011-12-12 15:15 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-kernel, patches
Hi Mark,
On Wed, Nov 30, 2011 at 04:52:34PM +0000, Mark Brown wrote:
> As WM1811 revision C was transparent to software the revision IDs for
> subsequent revisions are one less than they would normally be. Correct
> for this in log messages.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>
> I can fold this and other updates into the big regmap changes I posted
> the other day if that's helpful?
It seems you have quite many wm8994 patches on your mfd/wm8994 branch. It
would probably make sense for you to carry them through the regmap changes. If
that's fine with you, feel free to add my Acked-by to them.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mfd: Correct revision display for WM1811 revision D
2011-12-12 15:15 ` Samuel Ortiz
@ 2011-12-12 16:04 ` Mark Brown
0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2011-12-12 16:04 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: linux-kernel, patches
On Mon, Dec 12, 2011 at 04:15:47PM +0100, Samuel Ortiz wrote:
> > I can fold this and other updates into the big regmap changes I posted
> > the other day if that's helpful?
> It seems you have quite many wm8994 patches on your mfd/wm8994 branch. It
> would probably make sense for you to carry them through the regmap changes. If
> that's fine with you, feel free to add my Acked-by to them.
Yup, quite a few - I'll merge them all with the regmap stuff, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-12 16:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-30 16:52 [PATCH] mfd: Correct revision display for WM1811 revision D Mark Brown
2011-12-12 15:15 ` Samuel Ortiz
2011-12-12 16:04 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.