usb: musb: add musb_ida for multi instance support

Added musb_ida in musb_core.c to manage the multi core ids.

Signed-off-by: Ravi Babu <ravibabu@ti.com>
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Santhapuri, Damodar <damodar.santhapuri@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 24 insertions, 10 deletions

diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 8805f809175c..c269e61822c9 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -511,6 +511,7 @@ static int __devinit davinci_probe(struct platform_device *pdev)
         struct clk                      *clk;
 
         int                             ret = -ENOMEM;
+        int                             musbid;
 
         glue = kzalloc(sizeof(*glue), GFP_KERNEL);
         if (!glue) {
@@ -518,25 +519,34 @@ static int __devinit davinci_probe(struct platform_device *pdev)
                 goto err0;
         }
 
-        musb = platform_device_alloc("musb-hdrc", -1);
+        /* get the musb id */
+        musbid = musb_get_id(&pdev->dev, GFP_KERNEL);
+        if (musbid < 0) {
+                dev_err(&pdev->dev, "failed to allocate musb id\n");
+                ret = -ENOMEM;
+                goto err1;
+        }
+
+        musb = platform_device_alloc("musb-hdrc", musbid);
         if (!musb) {
                 dev_err(&pdev->dev, "failed to allocate musb device\n");
-                goto err1;
+                goto err2;
         }
 
         clk = clk_get(&pdev->dev, "usb");
         if (IS_ERR(clk)) {
                 dev_err(&pdev->dev, "failed to get clock\n");
                 ret = PTR_ERR(clk);
-                goto err2;
+                goto err3;
         }
 
         ret = clk_enable(clk);
         if (ret) {
                 dev_err(&pdev->dev, "failed to enable clock\n");
-                goto err3;
+                goto err4;
         }
 
+        musb->id                        = musbid;
         musb->dev.parent                = &pdev->dev;
         musb->dev.dma_mask              = &davinci_dmamask;
         musb->dev.coherent_dma_mask     = davinci_dmamask;
@@ -553,32 +563,35 @@ static int __devinit davinci_probe(struct platform_device *pdev)
                         pdev->num_resources);
         if (ret) {
                 dev_err(&pdev->dev, "failed to add resources\n");
-                goto err4;
+                goto err5;
         }
 
         ret = platform_device_add_data(musb, pdata, sizeof(*pdata));
         if (ret) {
                 dev_err(&pdev->dev, "failed to add platform_data\n");
-                goto err4;
+                goto err5;
         }
 
         ret = platform_device_add(musb);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register musb device\n");
-                goto err4;
+                goto err5;
         }
 
         return 0;
 
-err4:
+err5:
         clk_disable(clk);
 
-err3:
+err4:
         clk_put(clk);
 
-err2:
+err3:
         platform_device_put(musb);
 
+err2:
+        musb_put_id(&pdev->dev, musbid);
+
 err1:
         kfree(glue);
 
@@ -590,6 +603,7 @@ static int __devexit davinci_remove(struct platform_device *pdev)
 {
         struct davinci_glue             *glue = platform_get_drvdata(pdev);
 
+        musb_put_id(&pdev->dev, glue->musb->id);
         platform_device_del(glue->musb);
         platform_device_put(glue->musb);
         clk_disable(glue->clk);