4 files changed, 27 insertions, 0 deletions

diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index d1b2d534b991..3fe9a58fe6c7 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1541,6 +1541,12 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
                 dev_info(wm831x->dev, "WM8325 revision %c\n", 'A' + rev);
                 break;
 
+        case WM8326:
+                parent = WM8326;
+                wm831x->num_gpio = 12;
+                dev_info(wm831x->dev, "WM8326 revision %c\n", 'A' + rev);
+                break;
+
         default:
                 dev_err(wm831x->dev, "Unknown WM831x device %04x\n", ret);
                 ret = -EINVAL;
@@ -1612,6 +1618,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
         case WM8320:
         case WM8321:
         case WM8325:
+        case WM8326:
                 ret = mfd_add_devices(wm831x->dev, -1,
                                       wm8320_devs, ARRAY_SIZE(wm8320_devs),
                                       NULL, wm831x->irq_base);
diff --git a/drivers/mfd/wm831x-i2c.c b/drivers/mfd/wm831x-i2c.c
index 156b19859e81..38be5201c783 100644
--- a/drivers/mfd/wm831x-i2c.c
+++ b/drivers/mfd/wm831x-i2c.c
@@ -108,6 +108,7 @@ static const struct i2c_device_id wm831x_i2c_id[] = {
         { "wm8320", WM8320 },
         { "wm8321", WM8321 },
         { "wm8325", WM8325 },
+        { "wm8326", WM8326 },
         { }
 };
 MODULE_DEVICE_TABLE(i2c, wm831x_i2c_id);
diff --git a/drivers/mfd/wm831x-spi.c b/drivers/mfd/wm831x-spi.c
index 2789b151b0f9..0a8f772be88c 100644
--- a/drivers/mfd/wm831x-spi.c
+++ b/drivers/mfd/wm831x-spi.c
@@ -81,6 +81,8 @@ static int __devinit wm831x_spi_probe(struct spi_device *spi)
                 type = WM8321;
         else if (strcmp(spi->modalias, "wm8325") == 0)
                 type = WM8325;
+        else if (strcmp(spi->modalias, "wm8326") == 0)
+                type = WM8326;
         else {
                 dev_err(&spi->dev, "Unknown device type\n");
                 return -EINVAL;
@@ -184,6 +186,17 @@ static struct spi_driver wm8325_spi_driver = {
         .suspend        = wm831x_spi_suspend,
 };
 
+static struct spi_driver wm8326_spi_driver = {
+        .driver = {
+                .name   = "wm8326",
+                .bus    = &spi_bus_type,
+                .owner  = THIS_MODULE,
+        },
+        .probe          = wm831x_spi_probe,
+        .remove         = __devexit_p(wm831x_spi_remove),
+        .suspend        = wm831x_spi_suspend,
+};
+
 static int __init wm831x_spi_init(void)
 {
         int ret;
@@ -212,12 +225,17 @@ static int __init wm831x_spi_init(void)
         if (ret != 0)
                 pr_err("Failed to register WM8325 SPI driver: %d\n", ret);
 
+        ret = spi_register_driver(&wm8326_spi_driver);
+        if (ret != 0)
+                pr_err("Failed to register WM8326 SPI driver: %d\n", ret);
+
         return 0;
 }
 subsys_initcall(wm831x_spi_init);
 
 static void __exit wm831x_spi_exit(void)
 {
+        spi_unregister_driver(&wm8326_spi_driver);
         spi_unregister_driver(&wm8325_spi_driver);
         spi_unregister_driver(&wm8321_spi_driver);
         spi_unregister_driver(&wm8320_spi_driver);
diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h
index a1239c48b41a..903280d21866 100644
--- a/include/linux/mfd/wm831x/core.h
+++ b/include/linux/mfd/wm831x/core.h
@@ -245,6 +245,7 @@ enum wm831x_parent {
         WM8320 = 0x8320,
         WM8321 = 0x8321,
         WM8325 = 0x8325,
+        WM8326 = 0x8326,
 };
 
 struct wm831x {