Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65b3d52d authored by B, Ravi's avatar B, Ravi Committed by Felipe Balbi
Browse files

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: default avatarRavi Babu <ravibabu@ti.com>
Signed-off-by: default avatarAjay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: default avatarSanthapuri, Damodar <damodar.santhapuri@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 00a0b1d5

drivers/usb/musb/am35x.c

+28 −14
Original line number Diff line number Diff line
@@ -458,6 +458,7 @@ static int __devinit am35x_probe(struct platform_device *pdev) 
	struct clk			*clk;



	int				ret = -ENOMEM;

	int				musbid;



	glue = kzalloc(sizeof(*glue), GFP_KERNEL);

	if (!glue) {
@@ -465,38 +466,47 @@ static int __devinit am35x_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;

	}



	phy_clk = clk_get(&pdev->dev, "fck");

	if (IS_ERR(phy_clk)) {

		dev_err(&pdev->dev, "failed to get PHY clock\n");

		ret = PTR_ERR(phy_clk);

		goto err2;

		goto err3;

	}



	clk = clk_get(&pdev->dev, "ick");

	if (IS_ERR(clk)) {

		dev_err(&pdev->dev, "failed to get clock\n");

		ret = PTR_ERR(clk);

		goto err3;

		goto err4;

	}



	ret = clk_enable(phy_clk);

	if (ret) {

		dev_err(&pdev->dev, "failed to enable PHY clock\n");

		goto err4;

		goto err5;

	}



	ret = clk_enable(clk);

	if (ret) {

		dev_err(&pdev->dev, "failed to enable clock\n");

		goto err5;

		goto err6;

	}



	musb->id			= musbid;

	musb->dev.parent		= &pdev->dev;

	musb->dev.dma_mask		= &am35x_dmamask;

	musb->dev.coherent_dma_mask	= am35x_dmamask;
@@ -514,38 +524,41 @@ static int __devinit am35x_probe(struct platform_device *pdev) 
			pdev->num_resources);

	if (ret) {

		dev_err(&pdev->dev, "failed to add resources\n");

		goto err6;

		goto err7;

	}



	ret = platform_device_add_data(musb, pdata, sizeof(*pdata));

	if (ret) {

		dev_err(&pdev->dev, "failed to add platform_data\n");

		goto err6;

		goto err7;

	}



	ret = platform_device_add(musb);

	if (ret) {

		dev_err(&pdev->dev, "failed to register musb device\n");

		goto err6;

		goto err7;

	}



	return 0;



err6:

err7:

	clk_disable(clk);



err5:

err6:

	clk_disable(phy_clk);



err4:

err5:

	clk_put(clk);



err3:

err4:

	clk_put(phy_clk);



err2:

err3:

	platform_device_put(musb);



err2:

	musb_put_id(&pdev->dev, musbid);



err1:

	kfree(glue);
@@ -557,6 +570,7 @@ static int __devexit am35x_remove(struct platform_device *pdev) 
{

	struct am35x_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);

drivers/usb/musb/blackfin.c

+20 −6
Original line number Diff line number Diff line
@@ -454,6 +454,7 @@ static int __devinit bfin_probe(struct platform_device *pdev) 
	struct bfin_glue		*glue;



	int				ret = -ENOMEM;

	int				musbid;



	glue = kzalloc(sizeof(*glue), GFP_KERNEL);

	if (!glue) {
@@ -461,12 +462,21 @@ static int __devinit bfin_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;

	}



	musb->id			= musbid;

	musb->dev.parent		= &pdev->dev;

	musb->dev.dma_mask		= &bfin_dmamask;

	musb->dev.coherent_dma_mask	= bfin_dmamask;
@@ -482,26 +492,29 @@ static int __devinit bfin_probe(struct platform_device *pdev) 
			pdev->num_resources);

	if (ret) {

		dev_err(&pdev->dev, "failed to add resources\n");

		goto err2;

		goto err3;

	}



	ret = platform_device_add_data(musb, pdata, sizeof(*pdata));

	if (ret) {

		dev_err(&pdev->dev, "failed to add platform_data\n");

		goto err2;

		goto err3;

	}



	ret = platform_device_add(musb);

	if (ret) {

		dev_err(&pdev->dev, "failed to register musb device\n");

		goto err2;

		goto err3;

	}



	return 0;



err2:

err3:

	platform_device_put(musb);



err2:

	musb_put_id(&pdev->dev, musbid);



err1:

	kfree(glue);
@@ -513,6 +526,7 @@ static int __devexit bfin_remove(struct platform_device *pdev) 
{

	struct bfin_glue		*glue = platform_get_drvdata(pdev);



	musb_put_id(&pdev->dev, glue->musb->id);

	platform_device_del(glue->musb);

	platform_device_put(glue->musb);

	kfree(glue);

drivers/usb/musb/da8xx.c

+24 −10
Original line number Diff line number Diff line
@@ -479,6 +479,7 @@ static int __devinit da8xx_probe(struct platform_device *pdev) 
	struct clk			*clk;



	int				ret = -ENOMEM;

	int				musbid;



	glue = kzalloc(sizeof(*glue), GFP_KERNEL);

	if (!glue) {
@@ -486,25 +487,34 @@ static int __devinit da8xx_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, "usb20");

	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		= &da8xx_dmamask;

	musb->dev.coherent_dma_mask	= da8xx_dmamask;
@@ -521,32 +531,35 @@ static int __devinit da8xx_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);
@@ -558,6 +571,7 @@ static int __devexit da8xx_remove(struct platform_device *pdev) 
{

	struct da8xx_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);

drivers/usb/musb/davinci.c

+24 −10
Original line number Diff line number Diff line
@@ -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);

drivers/usb/musb/musb_core.c

+31 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 
#include <linux/prefetch.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/idr.h>



#include "musb_core.h"
@@ -114,6 +115,7 @@ 


#define MUSB_DRIVER_NAME "musb-hdrc"

const char musb_driver_name[] = MUSB_DRIVER_NAME;

static DEFINE_IDA(musb_ida);



MODULE_DESCRIPTION(DRIVER_INFO);

MODULE_AUTHOR(DRIVER_AUTHOR);
@@ -130,6 +132,35 @@ static inline struct musb *dev_to_musb(struct device *dev) 


/*-------------------------------------------------------------------------*/



int musb_get_id(struct device *dev, gfp_t gfp_mask)

{

	int ret;

	int id;



	ret = ida_pre_get(&musb_ida, gfp_mask);

	if (!ret) {

		dev_err(dev, "failed to reserve resource for id\n");

		return -ENOMEM;

	}



	ret = ida_get_new(&musb_ida, &id);

	if (ret < 0) {

		dev_err(dev, "failed to allocate a new id\n");

		return ret;

	}



	return id;

}

EXPORT_SYMBOL_GPL(musb_get_id);



void musb_put_id(struct device *dev, int id)

{



	dev_dbg(dev, "removing id %d\n", id);

	ida_remove(&musb_ida, id);

}

EXPORT_SYMBOL_GPL(musb_put_id);



#ifndef CONFIG_BLACKFIN

static int musb_ulpi_read(struct usb_phy *phy, u32 offset)

{