Commit b93cef55 authored Dec 02, 2010 by Mark Brown Committed by Samuel Ortiz Dec 22, 2010

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>

parent 88aec4f7

drivers/mfd/wm831x-core.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -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;