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

Commit e6480faa authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: musb: da8xx: give it a context structure 



that structure currently only holds a device
pointer to our own platform_device and musb's
platform_device, but soon it will hold pointers
to our clock structures and glue-specific bits
and pieces.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent e110de4d

drivers/usb/musb/da8xx.c

+28 −9
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ 


#define CFGCHIP2	IO_ADDRESS(DA8XX_SYSCFG0_BASE + DA8XX_CFGCHIP2_REG)



struct da8xx_glue {

	struct device		*dev;

	struct platform_device	*musb;

};



/*

 * REVISIT (PM): we should be able to keep the PHY in low power mode most

 * of the time (24 MHz oscillator and PLL off, etc.) by setting POWER.D0
@@ -489,55 +494,69 @@ static int __init da8xx_probe(struct platform_device *pdev) 
{

	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;

	struct platform_device		*musb;

	struct da8xx_glue		*glue;



	int				ret = -ENOMEM;



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

	if (!glue) {

		dev_err(&pdev->dev, "failed to allocate glue context\n");

		goto err0;

	}



	musb = platform_device_alloc("musb-hdrc", -1);

	if (!musb) {

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

		goto err0;

		goto err1;

	}



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

	musb->dev.dma_mask		= &da8xx_dmamask;

	musb->dev.coherent_dma_mask	= da8xx_dmamask;



	platform_set_drvdata(pdev, musb);

	glue->dev			= &pdev->dev;

	glue->musb			= musb;



	platform_set_drvdata(pdev, glue);



	ret = platform_device_add_resources(musb, pdev->resource,

			pdev->num_resources);

	if (ret) {

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

		goto err1;

		goto err2;

	}



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

	if (ret) {

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

		goto err1;

		goto err2;

	}



	ret = platform_device_add(musb);

	if (ret) {

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

		goto err1;

		goto err2;

	}



	return 0;



err1:

err2:

	platform_device_put(musb);



err1:

	kfree(glue);



err0:

	return ret;

}



static int __exit da8xx_remove(struct platform_device *pdev)

{

	struct platform_device		*musb = platform_get_drvdata(pdev);

	struct da8xx_glue		*glue = platform_get_drvdata(pdev);



	platform_device_del(musb);

	platform_device_put(musb);

	platform_device_del(glue->musb);

	platform_device_put(glue->musb);

	kfree(glue);



	return 0;

}