usb: musb: split davinci 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-davinci/usb.c b/arch/arm/mach-davinci/usb.c
index 0c7735bc0d19c0d25763b18c46fa3e1dddcdeacb..803dbacfa5cd8ea2d72d46118f1f8365260465a5 100644 (file)
--- a/arch/arm/mach-davinci/usb.c
+++ b/arch/arm/mach-davinci/usb.c
@@ -76,7 +76,7 @@ static struct resource usb_resources[] = {
 static u64 usb_dmamask = DMA_BIT_MASK(32);
 
 static struct platform_device usb_dev = {
-       .name           = "musb-hdrc",
+       .name           = "musb-davinci",
        .id             = -1,
        .dev = {
                .platform_data          = &usb_data,

diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index 8e0c9ad85531e72dddcda4ad8dd065f5d3177e5b..2692eeb2085feb9828e72482c4b4a3b2cc094796 100644 (file)
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -14,13 +14,13 @@ musb_hdrc-$(CONFIG_DEBUG_FS)                        += musb_debugfs.o
 
 # Hardware Glue Layer
 
-musb_hdrc-$(CONFIG_USB_MUSB_DAVINCI)           += davinci.o
 musb_hdrc-$(CONFIG_USB_MUSB_DA8XX)             += da8xx.o
 musb_hdrc-$(CONFIG_USB_MUSB_BLACKFIN)          += blackfin.o
 
 obj-$(CONFIG_USB_MUSB_OMAP2PLUS)               += omap2430.o
 obj-$(CONFIG_USB_MUSB_AM35X)                   += am35x.o
 obj-$(CONFIG_USB_MUSB_TUSB6010)                        += tusb6010.o
+obj-$(CONFIG_USB_MUSB_DAVINCI)                 += davinci.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/davinci.c b/drivers/usb/musb/davinci.c
index e283b5af8de09f4b703ce33c15cb9df01176ffd1..bdf1940d6fee8941cee047fa205f520e744a2351 100644 (file)
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -30,6 +30,8 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
 
 #include <mach/hardware.h>
 #include <mach/memory.h>
@@ -514,3 +516,85 @@ const struct musb_platform_ops musb_ops = {
 
        .set_vbus       = davinci_musb_set_vbus,
 };
+
+static u64 davinci_dmamask = DMA_BIT_MASK(32);
+
+static int __init davinci_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              = &davinci_dmamask;
+       musb->dev.coherent_dma_mask     = davinci_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 davinci_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 davinci_driver = {
+       .remove         = __exit_p(davinci_remove),
+       .driver         = {
+               .name   = "musb-davinci",
+       },
+};
+
+MODULE_DESCRIPTION("DaVinci MUSB Glue Layer");
+MODULE_AUTHOR("Felipe Balbi <balbi@ti.com>");
+MODULE_LICENSE("GPL v2");
+
+static int __init davinci_init(void)
+{
+       return platform_driver_probe(&davinci_driver, davinci_probe);
+}
+subsys_initcall(davinci_init);
+
+static void __exit davinci_exit(void)
+{
+       platform_driver_unregister(&davinci_driver);
+}
+module_exit(davinci_exit);