2 files changed, 36 insertions, 5 deletions

diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c
index a0982e809851..0c7a9d5047f4 100644
--- a/drivers/regulator/wm831x-dcdc.c
+++ b/drivers/regulator/wm831x-dcdc.c
@@ -504,11 +504,17 @@ static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
 {
         struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
         struct wm831x_pdata *pdata = wm831x->dev->platform_data;
-        int id = pdev->id % ARRAY_SIZE(pdata->dcdc);
+        int id;
         struct wm831x_dcdc *dcdc;
         struct resource *res;
         int ret, irq;
 
+        if (pdata && pdata->wm831x_num)
+                id = (pdata->wm831x_num * 10) + 1;
+        else
+                id = 0;
+        id = pdev->id - id;
+
         dev_dbg(&pdev->dev, "Probing DCDC%d\n", id + 1);
 
         if (pdata == NULL || pdata->dcdc[id] == NULL)
@@ -709,11 +715,17 @@ static __devinit int wm831x_buckp_probe(struct platform_device *pdev)
 {
         struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
         struct wm831x_pdata *pdata = wm831x->dev->platform_data;
-        int id = pdev->id % ARRAY_SIZE(pdata->dcdc);
+        int id;
         struct wm831x_dcdc *dcdc;
         struct resource *res;
         int ret, irq;
 
+        if (pdata && pdata->wm831x_num)
+                id = (pdata->wm831x_num * 10) + 1;
+        else
+                id = 0;
+        id = pdev->id - id;
+
         dev_dbg(&pdev->dev, "Probing DCDC%d\n", id + 1);
 
         if (pdata == NULL || pdata->dcdc[id] == NULL)
diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c
index 2220cf8defb1..6709710a059e 100644
--- a/drivers/regulator/wm831x-ldo.c
+++ b/drivers/regulator/wm831x-ldo.c
@@ -310,11 +310,17 @@ static __devinit int wm831x_gp_ldo_probe(struct platform_device *pdev)
 {
         struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
         struct wm831x_pdata *pdata = wm831x->dev->platform_data;
-        int id = pdev->id % ARRAY_SIZE(pdata->ldo);
+        int id;
         struct wm831x_ldo *ldo;
         struct resource *res;
         int ret, irq;
 
+        if (pdata && pdata->wm831x_num)
+                id = (pdata->wm831x_num * 10) + 1;
+        else
+                id = 0;
+        id = pdev->id - id;
+
         dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
         if (pdata == NULL || pdata->ldo[id] == NULL)
@@ -574,11 +580,17 @@ static __devinit int wm831x_aldo_probe(struct platform_device *pdev)
 {
         struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
         struct wm831x_pdata *pdata = wm831x->dev->platform_data;
-        int id = pdev->id % ARRAY_SIZE(pdata->ldo);
+        int id;
         struct wm831x_ldo *ldo;
         struct resource *res;
         int ret, irq;
 
+        if (pdata && pdata->wm831x_num)
+                id = (pdata->wm831x_num * 10) + 1;
+        else
+                id = 0;
+        id = pdev->id - id;
+
         dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
         if (pdata == NULL || pdata->ldo[id] == NULL)
@@ -764,11 +776,18 @@ static __devinit int wm831x_alive_ldo_probe(struct platform_device *pdev)
 {
         struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
         struct wm831x_pdata *pdata = wm831x->dev->platform_data;
-        int id = pdev->id % ARRAY_SIZE(pdata->ldo);
+        int id;
         struct wm831x_ldo *ldo;
         struct resource *res;
         int ret;
 
+        if (pdata && pdata->wm831x_num)
+                id = (pdata->wm831x_num * 10) + 1;
+        else
+                id = 0;
+        id = pdev->id - id;
+
+
         dev_dbg(&pdev->dev, "Probing LDO%d\n", id + 1);
 
         if (pdata == NULL || pdata->ldo[id] == NULL)