2010-12-02 16:25:49

by Mark Brown

Subject: [PATCH] mfd: Support additional parent IDs for wm831x

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]>
Cc: [email protected]
---
drivers/mfd/wm831x-core.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index 47b58cc..3fe9a58 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1455,7 +1455,11 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
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;
--
1.7.1

2010-12-09 13:53:14

by Samuel Ortiz

Subject: Re: [PATCH] mfd: Support additional parent IDs for wm831x

Hi Mark,

On Thu, Dec 02, 2010 at 04:25:43PM +0000, Mark Brown wrote:
> Some newer device revisions add a second parent ID. Support this in
> the device validity checks done at startup.
Patch applied to both my for-next and for-linus branches, thanks.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/