projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 88aec4f)
mfd: Support additional parent IDs for wm831x
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 2 Dec 2010 16:25:43 +0000 (16:25 +0000)
committerSamuel Ortiz <sameo@linux.intel.com>
Wed, 22 Dec 2010 11:05:22 +0000 (12:05 +0100)
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>
drivers/mfd/wm831x-core.c patch | blob | blame | history

diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index e1a2f4b785293227803a4ac133a9be87b9c78bef..76cadcf3b1fee2ccf996d318c01137c53ba852a7 100644 (file)
--- 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;