OMAP2+: musb: hwmod adaptation for musb registration

Using omap_device_build API instead of platform_device_register for
OMAP2430,OMAP3xxx, OMAP4430 and AM35x musb device registration.
The device specific resources defined in centralized
database will be used.

Signed-off-by: Hema HK <hemahk@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Cousson, Benoit <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
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 9788b4941857f40d50d48fa6470ee14e179bc373..a9d4d143086d73463b97c093cc9f022de8e1d679 100644 (file)
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -30,26 +30,11 @@
 #include <mach/irqs.h>
 #include <mach/am35xx.h>
 #include <plat/usb.h>
+#include <plat/omap_device.h>
 #include "mux.h"
 
 #if defined(CONFIG_USB_MUSB_OMAP2PLUS) || defined (CONFIG_USB_MUSB_AM35X)
 
-static struct resource musb_resources[] = {
-       [0] = { /* start and end set dynamically */
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = { /* general IRQ */
-               .start  = INT_243X_HS_USB_MC,
-               .flags  = IORESOURCE_IRQ,
-               .name   = "mc",
-       },
-       [2] = { /* DMA IRQ */
-               .start  = INT_243X_HS_USB_DMA,
-               .flags  = IORESOURCE_IRQ,
-               .name   = "dma",
-       },
-};
-
 static struct musb_hdrc_config musb_config = {
        .multipoint     = 1,
        .dyn_fifo       = 1,
@@ -77,16 +62,12 @@ static struct musb_hdrc_platform_data musb_plat = {
 
 static u64 musb_dmamask = DMA_BIT_MASK(32);
 
-static struct platform_device musb_device = {
-       .name           = "musb-omap2430",
-       .id             = -1,
-       .dev = {
-               .dma_mask               = &musb_dmamask,
-               .coherent_dma_mask      = DMA_BIT_MASK(32),
-               .platform_data          = &musb_plat,
+static struct omap_device_pm_latency omap_musb_latency[] = {
+       {
+               .deactivate_func        = omap_device_idle_hwmods,
+               .activate_func          = omap_device_enable_hwmods,
+               .flags                  = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
        },
-       .num_resources  = ARRAY_SIZE(musb_resources),
-       .resource       = musb_resources,
 };
 
 static void usb_musb_mux_init(struct omap_musb_board_data *board_data)
@@ -126,24 +107,20 @@ static void usb_musb_mux_init(struct omap_musb_board_data *board_data)
                break;
        }
 }
+
 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()) {
-               musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
-       } else if (cpu_is_omap44xx()) {
-               musb_resources[0].start = OMAP44XX_HSUSB_OTG_BASE;
-               musb_resources[1].start = OMAP44XX_IRQ_HS_USB_MC_N;
-               musb_resources[2].start = OMAP44XX_IRQ_HS_USB_DMA_N;
+       struct omap_hwmod               *oh;
+       struct omap_device              *od;
+       struct platform_device          *pdev;
+       struct device                   *dev;
+       int                             bus_id = -1;
+       const char                      *oh_name, *name;
 
+       if (cpu_is_omap3517() || cpu_is_omap3505()) {
+       } else if (cpu_is_omap44xx()) {
                usb_musb_mux_init(board_data);
        }
-       musb_resources[0].end = musb_resources[0].start + SZ_4K - 1;
 
        /*
         * REVISIT: This line can be removed once all the platforms using
@@ -155,8 +132,35 @@ void __init usb_musb_init(struct omap_musb_board_data *board_data)
        musb_plat.mode = board_data->mode;
        musb_plat.extvbus = board_data->extvbus;
 
-       if (platform_device_register(&musb_device) < 0)
-               printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n");
+       if (cpu_is_omap3517() || cpu_is_omap3505()) {
+               oh_name = "am35x_otg_hs";
+               name = "musb-am35x";
+       } else {
+               oh_name = "usb_otg_hs";
+               name = "musb-omap2430";
+       }
+
+       oh = omap_hwmod_lookup(oh_name);
+       if (!oh) {
+               pr_err("Could not look up %s\n", oh_name);
+               return;
+       }
+
+       od = omap_device_build(name, bus_id, oh, &musb_plat,
+                              sizeof(musb_plat), omap_musb_latency,
+                              ARRAY_SIZE(omap_musb_latency), false);
+       if (IS_ERR(od)) {
+               pr_err("Could not build omap_device for %s %s\n",
+                                               name, oh_name);
+               return;
+       }
+
+       pdev = &od->pdev;
+       dev = &pdev->dev;
+       get_device(dev);
+       dev->dma_mask = &musb_dmamask;
+       dev->coherent_dma_mask = musb_dmamask;
+       put_device(dev);
 }
 
 #else