This is a note to let you know that I've just added the patch titled
mfd: Support additional parent IDs for wm831x
to the 2.6.36-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mfd-support-additional-parent-ids-for-wm831x.patch
and it can be found in the queue-2.6.36 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From b93cef556162b0f33399bfe5f307c54f51554e09 Mon Sep 17 00:00:00 2001
From: Mark Brown <[email protected]>
Date: Thu, 2 Dec 2010 16:25:43 +0000
Subject: mfd: Support additional parent IDs for wm831x
From: Mark Brown <[email protected]>
commit b93cef556162b0f33399bfe5f307c54f51554e09 upstream.
Some newer device revisions add a second parent ID. Support this in
the device validity checks done at startup.
Signed-off-by: Mark Brown <[email protected]>
Signed-off-by: Samuel Ortiz <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/mfd/wm831x-core.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1464,7 +1464,11 @@ static int wm831x_device_init(struct wm8
dev_err(wm831x->dev, "Failed to read parent ID: %d\n", ret);
goto err;
}
- if (ret != 0x6204) {
+ switch (ret) {
+ case 0x6204:
+ case 0x6246:
+ break;
+ default:
dev_err(wm831x->dev, "Device is not a WM831x: ID %x\n", ret);
ret = -EINVAL;
goto err;
Patches currently in stable-queue which might be from
[email protected] are
queue-2.6.36/mfd-supply-irq-base-for-wm832x-devices.patch
queue-2.6.36/asoc-fix-swap-of-left-and-right-channels-for-wm8993-4-speaker-boost-gain.patch
queue-2.6.36/asoc-fix-deemphasis-control-in-wm8904-55-60-codecs.patch
queue-2.6.36/asoc-wm8580-fix-r8-initial-value.patch
queue-2.6.36/asoc-fix-off-by-one-error-in-wm8994-eq-register-bank-size.patch
queue-2.6.36/mfd-support-additional-parent-ids-for-wm831x.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
