| From | Andi Kleen <> | Subject | [PATCH] [118/139] mfd: Support additional parent IDs for wm831x | Date | Tue, 1 Feb 2011 16:45:17 -0800 (PST) |
| |
2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Mark Brown <broonie@opensource.wolfsonmicro.com>
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 <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andi Kleen <ak@linux.intel.com>
--- drivers/mfd/wm831x-core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Index: linux-2.6.35.y/drivers/mfd/wm831x-core.c =================================================================== --- linux-2.6.35.y.orig/drivers/mfd/wm831x-core.c +++ linux-2.6.35.y/drivers/mfd/wm831x-core.c @@ -1463,7 +1463,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;
|