Skip to content

Commit

Permalink
usb: musb: split omap2430 to its own platform_driver
Browse files Browse the repository at this point in the history
Just adding its own platform_driver, not really
using it yet.

When all HW glue layers are converted, more patches
will come to split power management code from musb_core
and move it completely to HW glue layer.

Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Felipe Balbi committed Dec 10, 2010
1 parent 05ac10d commit dc09886
Showing 3 changed files with 87 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/usb-musb.c
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ static struct musb_hdrc_platform_data musb_plat = {
static u64 musb_dmamask = DMA_BIT_MASK(32);

static struct platform_device musb_device = {
.name = "musb-hdrc",
.name = "musb-omap2430",
.id = -1,
.dev = {
.dma_mask = &musb_dmamask,
3 changes: 2 additions & 1 deletion drivers/usb/musb/Makefile
Original file line number Diff line number Diff line change
@@ -17,10 +17,11 @@ musb_hdrc-$(CONFIG_DEBUG_FS) += musb_debugfs.o
musb_hdrc-$(CONFIG_USB_MUSB_DAVINCI) += davinci.o
musb_hdrc-$(CONFIG_USB_MUSB_DA8XX) += da8xx.o
musb_hdrc-$(CONFIG_USB_MUSB_TUSB6010) += tusb6010.o
musb_hdrc-$(CONFIG_USB_MUSB_OMAP2PLUS) += omap2430.o
musb_hdrc-$(CONFIG_USB_MUSB_AM35X) += am35x.o
musb_hdrc-$(CONFIG_USB_MUSB_BLACKFIN) += blackfin.o

obj-$(CONFIG_USB_MUSB_OMAP2PLUS) += omap2430.o

# the kconfig must guarantee that only one of the
# possible I/O schemes will be enabled at a time ...
# PIO only, or DMA (several potential schemes).
84 changes: 84 additions & 0 deletions drivers/usb/musb/omap2430.c
Original file line number Diff line number Diff line change
@@ -31,6 +31,8 @@
#include <linux/list.h>
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>

#include "musb_core.h"
#include "omap2430.h"
@@ -341,3 +343,85 @@ const struct musb_platform_ops musb_ops = {

.set_vbus = omap2430_musb_set_vbus,
};

static u64 omap2430_dmamask = DMA_BIT_MASK(32);

static int __init omap2430_probe(struct platform_device *pdev)
{
struct musb_hdrc_platform_data *pdata = pdev->dev.platform_data;
struct platform_device *musb;

int ret = -ENOMEM;

musb = platform_device_alloc("musb-hdrc", -1);
if (!musb) {
dev_err(&pdev->dev, "failed to allocate musb device\n");
goto err0;
}

musb->dev.parent = &pdev->dev;
musb->dev.dma_mask = &omap2430_dmamask;
musb->dev.coherent_dma_mask = omap2430_dmamask;

platform_set_drvdata(pdev, musb);

ret = platform_device_add_resources(musb, pdev->resource,
pdev->num_resources);
if (ret) {
dev_err(&pdev->dev, "failed to add resources\n");
goto err1;
}

ret = platform_device_add_data(musb, pdata, sizeof(*pdata));
if (ret) {
dev_err(&pdev->dev, "failed to add platform_data\n");
goto err1;
}

ret = platform_device_add(musb);
if (ret) {
dev_err(&pdev->dev, "failed to register musb device\n");
goto err1;
}

return 0;

err1:
platform_device_put(musb);

err0:
return ret;
}

static int __exit omap2430_remove(struct platform_device *pdev)
{
struct platform_device *musb = platform_get_drvdata(pdev);

platform_device_del(musb);
platform_device_put(musb);

return 0;
}

static struct platform_driver omap2430_driver = {
.remove = __exit_p(omap2430_remove),
.driver = {
.name = "musb-omap2430",
},
};

MODULE_DESCRIPTION("OMAP2PLUS MUSB Glue Layer");
MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
MODULE_LICENSE("GPL v2");

static int __init omap2430_init(void)
{
return platform_driver_probe(&omap2430_driver, omap2430_probe);
}
subsys_initcall(omap2430_init);

static void __exit omap2430_exit(void)
{
platform_driver_unregister(&omap2430_driver);
}
module_exit(omap2430_exit);

0 comments on commit dc09886

Please sign in to comment.