diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-02 16:25:43 +0000 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-12-22 12:05:22 +0100 |
| commit | b93cef556162b0f33399bfe5f307c54f51554e09 (patch) | |
| tree | f25fa31e6d24e06f26b319bb767fa795011bfdef /drivers/mfd | |
| parent | 88aec4f7b67b5889ba5b4beac2d2c1400451c318 (diff) | |
| download | op-kernel-dev-b93cef556162b0f33399bfe5f307c54f51554e09.zip op-kernel-dev-b93cef556162b0f33399bfe5f307c54f51554e09.tar.gz | |
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 <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | 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 e1a2f4b..76cadcf 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; |
