diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-01-10 14:50:08 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-01-10 14:50:08 +0530 |
| commit | bf5a56deb588e201d95f21c00257e88ac721f90b (patch) | |
| tree | d418c01fea425ea8063a6c0fb6f7119b301e135a /drivers/mfd | |
| parent | 3cfc0c8843cbc3f2c859d9eea1003834af6119e7 (diff) | |
| parent | b99662a653ac3d90bfada1bfc326d3138229860c (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/fuse.c
drivers/misc/Makefile
Change-Id: I300b925d78b31efe00c342190d8dbd50e2e81230
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/wm831x-core.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c index 1e7aaaf6cc6f..b5347167aa72 100644 --- a/drivers/mfd/wm831x-core.c +++ b/drivers/mfd/wm831x-core.c @@ -1464,7 +1464,11 @@ static 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; @@ -1617,7 +1621,7 @@ static int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq) case WM8321: ret = mfd_add_devices(wm831x->dev, -1, wm8320_devs, ARRAY_SIZE(wm8320_devs), - NULL, 0); + NULL, wm831x->irq_base); break; default: |