1 files changed, 12 insertions, 6 deletions

diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index 265f75fc6a25..04994b23bb6b 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1440,7 +1440,7 @@ static struct mfd_cell backlight_devs[] = {
 int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
 {
         struct wm831x_pdata *pdata = wm831x->dev->platform_data;
-        int rev;
+        int rev, wm831x_num;
         enum wm831x_parent parent;
         int ret, i;
 
@@ -1592,6 +1592,12 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
                 }
         }
 
+        /* Multiply by 10 as we have many subdevices of the same type */
+        if (pdata && pdata->wm831x_num)
+                wm831x_num = pdata->wm831x_num * 10;
+        else
+                wm831x_num = -1;
+
         ret = wm831x_irq_init(wm831x, irq);
         if (ret != 0)
                 goto err;
@@ -1609,19 +1615,19 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
         /* The core device is up, instantiate the subdevices. */
         switch (parent) {
         case WM8310:
-                ret = mfd_add_devices(wm831x->dev, -1,
+                ret = mfd_add_devices(wm831x->dev, wm831x_num,
                                       wm8310_devs, ARRAY_SIZE(wm8310_devs),
                                       NULL, wm831x->irq_base);
                 break;
 
         case WM8311:
-                ret = mfd_add_devices(wm831x->dev, -1,
+                ret = mfd_add_devices(wm831x->dev, wm831x_num,
                                       wm8311_devs, ARRAY_SIZE(wm8311_devs),
                                       NULL, wm831x->irq_base);
                 break;
 
         case WM8312:
-                ret = mfd_add_devices(wm831x->dev, -1,
+                ret = mfd_add_devices(wm831x->dev, wm831x_num,
                                       wm8312_devs, ARRAY_SIZE(wm8312_devs),
                                       NULL, wm831x->irq_base);
                 break;
@@ -1630,7 +1636,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
         case WM8321:
         case WM8325:
         case WM8326:
-                ret = mfd_add_devices(wm831x->dev, -1,
+                ret = mfd_add_devices(wm831x->dev, wm831x_num,
                                       wm8320_devs, ARRAY_SIZE(wm8320_devs),
                                       NULL, wm831x->irq_base);
                 break;
@@ -1647,7 +1653,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
 
         if (pdata && pdata->backlight) {
                 /* Treat errors as non-critical */
-                ret = mfd_add_devices(wm831x->dev, -1, backlight_devs,
+                ret = mfd_add_devices(wm831x->dev, wm831x_num, backlight_devs,
                                       ARRAY_SIZE(backlight_devs), NULL,
                                       wm831x->irq_base);
                 if (ret < 0)