]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
mfd: Add WM8325 support
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 28 Sep 2010 16:13:39 +0000 (09:13 -0700)
committerSamuel Ortiz <sameo@linux.intel.com>
Thu, 28 Oct 2010 22:29:43 +0000 (00:29 +0200)
The WM8325 is a PMIC for low power, high performance applications.  From
a software point of view the device is identical to the WM8320, all the
differences are at the hardware level.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/mfd/wm831x-core.c

index 1e7aaaf6cc6f871e49c7a59e1cb72d42020a197d..ad36579bc815f21bef5a8162dd52dfdedb3597ad 100644 (file)
@@ -96,6 +96,7 @@ enum wm831x_parent {
        WM8312 = 0x8312,
        WM8320 = 0x8320,
        WM8321 = 0x8321,
+       WM8325 = 0x8325,
 };
 
 static int wm831x_reg_locked(struct wm831x *wm831x, unsigned short reg)
@@ -1540,6 +1541,12 @@ static int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
                dev_info(wm831x->dev, "WM8321 revision %c\n", 'A' + rev);
                break;
 
+       case WM8325:
+               parent = WM8325;
+               wm831x->num_gpio = 12;
+               dev_info(wm831x->dev, "WM8325 revision %c\n", 'A' + rev);
+               break;
+
        default:
                dev_err(wm831x->dev, "Unknown WM831x device %04x\n", ret);
                ret = -EINVAL;
@@ -1620,6 +1627,12 @@ static int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
                                      NULL, 0);
                break;
 
+       case WM8325:
+               ret = mfd_add_devices(wm831x->dev, -1,
+                                     wm8320_devs, ARRAY_SIZE(wm8320_devs),
+                                     NULL, 0);
+               break;
+
        default:
                /* If this happens the bus probe function is buggy */
                BUG();
@@ -1791,6 +1804,7 @@ static const struct i2c_device_id wm831x_i2c_id[] = {
        { "wm8312", WM8312 },
        { "wm8320", WM8320 },
        { "wm8321", WM8321 },
+       { "wm8325", WM8325 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, wm831x_i2c_id);