usb: musb: split am35x to its own platform_driver

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>

diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 542387a598ed1c78316a38c53e33c3e5c42bb361..9107883287f6fe0cf5666982c37bb5b604953702 100644 (file)
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -93,6 +93,7 @@ void __init usb_musb_init(struct omap_musb_board_data *board_data)
        if (cpu_is_omap243x()) {
                musb_resources[0].start = OMAP243X_HS_BASE;
        } else if (cpu_is_omap3517() || cpu_is_omap3505()) {
+               musb_device.name = "musb-am35x";
                musb_resources[0].start = AM35XX_IPSS_USBOTGSS_BASE;
                musb_resources[1].start = INT_35XX_USBOTG_IRQ;
        } else if (cpu_is_omap34xx()) {

diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index 4792001a3d06638df056d5e146e57d3b931b9e20..a48c86d9b4d03d957b37f83f5006566084157164 100644 (file)
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -17,10 +17,10 @@ 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_AM35X)             += am35x.o
 musb_hdrc-$(CONFIG_USB_MUSB_BLACKFIN)          += blackfin.o
 
 obj-$(CONFIG_USB_MUSB_OMAP2PLUS)               += omap2430.o
+obj-$(CONFIG_USB_MUSB_AM35X)                   += am35x.o
 
 # the kconfig must guarantee that only one of the
 # possible I/O schemes will be enabled at a time ...

diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index be17610d7fc260bc9aac130abd1a36b45d258e2f..0ae01f57b3df7fea9ba2f76cff67968a8f6f39a7 100644 (file)
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -29,6 +29,8 @@
 #include <linux/init.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
 
 #include <plat/control.h>
 #include <plat/usb.h>
@@ -535,3 +537,85 @@ const struct musb_platform_ops musb_ops = {
 
        .set_vbus       = am35x_musb_set_vbus,
 };
+
+static u64 am35x_dmamask = DMA_BIT_MASK(32);
+
+static int __init am35x_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              = &am35x_dmamask;
+       musb->dev.coherent_dma_mask     = am35x_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 am35x_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 am35x_driver = {
+       .remove         = __exit_p(am35x_remove),
+       .driver         = {
+               .name   = "musb-am35x",
+       },
+};
+
+MODULE_DESCRIPTION("AM35x MUSB Glue Layer");
+MODULE_AUTHOR("Ajay Kumar Gupta <ajay.gupta@ti.com>");
+MODULE_LICENSE("GPL v2");
+
+static int __init am35x_init(void)
+{
+       return platform_driver_probe(&am35x_driver, am35x_probe);
+}
+subsys_initcall(am35x_init);
+
+static void __exit am35x_exit(void)
+{
+       platform_driver_unregister(&am35x_driver);
+}
+module_exit(am35x_exit);