]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ARM: OMAP3: MUSB initialization for omap hw, v2
authorFelipe Balbi <felipe.balbi@nokia.com>
Tue, 24 Mar 2009 01:34:06 +0000 (18:34 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 24 Mar 2009 01:51:24 +0000 (18:51 -0700)
Create a generic board-file for initializing usb
on omap2430 and omap3 boards.

Patch modified by Tony to build the module based on
CONFIG_USB_MUSB_SOC. Also merged in a patch adding
the nop xceiv from Ajay Kumar Gupta <ajay.gupta@ti.com>.

Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/usb-musb.c [new file with mode: 0644]
arch/arm/plat-omap/include/mach/usb.h

index bbd12bc10fdc1dc39d642227059999d74de5aec8..29f6ca94c3608a390f5822a5e56038828ef88fc5 100644 (file)
@@ -39,3 +39,7 @@ obj-$(CONFIG_MACH_OVERO)              += board-overo.o \
 obj-$(CONFIG_MACH_OMAP3_PANDORA)       += board-omap3pandora.o \
                                           mmc-twl4030.o
 
+# Platform specific device init code
+ifeq ($(CONFIG_USB_MUSB_SOC),y)
+obj-y                                  += usb-musb.o
+endif
index c8abe6a8dfe9dd6892542ff7b4189b3b0ae38474..21ee2195eb53df61989b0e69fa835c6acb0e0784 100644 (file)
@@ -35,6 +35,7 @@
 #include <mach/board.h>
 #include <mach/common.h>
 #include <mach/gpmc.h>
+#include <mach/usb.h>
 
 #include "mmc-twl4030.h"
 
@@ -254,6 +255,7 @@ static void __init omap_2430sdp_init(void)
        omap_board_config_size = ARRAY_SIZE(sdp2430_config);
        omap_serial_init();
        twl4030_mmc_init(mmc);
+       usb_musb_init();
 }
 
 static void __init omap_2430sdp_map_io(void)
index f035d7836e554533ccd816099ea1e068daef0ab4..92661e5df93e6ab38c1dec976cbb7aecf47f2288 100644 (file)
@@ -37,6 +37,7 @@
 #include <asm/io.h>
 #include <asm/delay.h>
 #include <mach/control.h>
+#include <mach/usb.h>
 
 #include "mmc-twl4030.h"
 
@@ -164,6 +165,7 @@ static void __init omap_ldp_init(void)
        omap_board_config_size = ARRAY_SIZE(ldp_config);
        omap_serial_init();
        twl4030_mmc_init(mmc);
+       usb_musb_init();
 }
 
 static void __init omap_ldp_map_io(void)
index e3c862866b76aeca512021bf590e3f4ff878893c..2f3d821e6346b2078d9c7a1e0994544fa277a63e 100644 (file)
@@ -41,6 +41,7 @@
 #include <mach/gpmc.h>
 #include <mach/nand.h>
 #include <mach/mux.h>
+#include <mach/usb.h>
 
 #include "mmc-twl4030.h"
 
@@ -313,6 +314,7 @@ static void __init omap3_beagle_init(void)
        /* REVISIT leave DVI powered down until it's needed ... */
        gpio_direction_output(170, true);
 
+       usb_musb_init();
        omap3beagle_flash_init();
 }
 
index 6e17180c1a5175adfb528f5dc063202e176ddfd4..16e2128daa12f1b5741af9766011853cd00a3e97 100644 (file)
@@ -34,6 +34,7 @@
 #include <mach/gpio.h>
 #include <mach/hardware.h>
 #include <mach/mcspi.h>
+#include <mach/usb.h>
 
 #include "mmc-twl4030.h"
 
@@ -200,6 +201,7 @@ static void __init omap3pandora_init(void)
        spi_register_board_info(omap3pandora_spi_board_info,
                        ARRAY_SIZE(omap3pandora_spi_board_info));
        omap3pandora_ads7846_init();
+       usb_musb_init();
 }
 
 static void __init omap3pandora_map_io(void)
index 9c14324d8c6839985592579ff4563093c3d62d2f..d3ceed398e0b03df926f14b78f24b7ecf7cc15d7 100644 (file)
@@ -43,6 +43,7 @@
 #include <mach/gpmc.h>
 #include <mach/hardware.h>
 #include <mach/nand.h>
+#include <mach/usb.h>
 
 #include "mmc-twl4030.h"
 
@@ -228,6 +229,7 @@ static void __init overo_init(void)
        omap_serial_init();
        twl4030_mmc_init(mmc);
        overo_flash_init();
+       usb_musb_init();
 
        if ((gpio_request(OVERO_GPIO_W2W_NRESET,
                          "OVERO_GPIO_W2W_NRESET") == 0) &&
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
new file mode 100644 (file)
index 0000000..fc74e91
--- /dev/null
@@ -0,0 +1,187 @@
+/*
+ * linux/arch/arm/mach-omap2/usb-musb.c
+ *
+ * This file will contain the board specific details for the
+ * MENTOR USB OTG controller on OMAP3430
+ *
+ * Copyright (C) 2007-2008 Texas Instruments
+ * Copyright (C) 2008 Nokia Corporation
+ * Author: Vikram Pandita
+ *
+ * Generalization by:
+ * Felipe Balbi <felipe.balbi@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/clk.h>
+#include <linux/dma-mapping.h>
+#include <linux/io.h>
+
+#include <linux/usb/musb.h>
+
+#include <mach/hardware.h>
+#include <mach/irqs.h>
+#include <mach/pm.h>
+#include <mach/mux.h>
+#include <mach/usb.h>
+
+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,
+       },
+       [2] = { /* DMA IRQ */
+               .start  = INT_243X_HS_USB_DMA,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static int clk_on;
+
+static int musb_set_clock(struct clk *clk, int state)
+{
+       if (state) {
+               if (clk_on > 0)
+                       return -ENODEV;
+
+               clk_enable(clk);
+               clk_on = 1;
+       } else {
+               if (clk_on == 0)
+                       return -ENODEV;
+
+               clk_disable(clk);
+               clk_on = 0;
+       }
+
+       return 0;
+}
+
+static struct musb_hdrc_eps_bits musb_eps[] = {
+       {       "ep1_tx", 10,   },
+       {       "ep1_rx", 10,   },
+       {       "ep2_tx", 9,    },
+       {       "ep2_rx", 9,    },
+       {       "ep3_tx", 3,    },
+       {       "ep3_rx", 3,    },
+       {       "ep4_tx", 3,    },
+       {       "ep4_rx", 3,    },
+       {       "ep5_tx", 3,    },
+       {       "ep5_rx", 3,    },
+       {       "ep6_tx", 3,    },
+       {       "ep6_rx", 3,    },
+       {       "ep7_tx", 3,    },
+       {       "ep7_rx", 3,    },
+       {       "ep8_tx", 2,    },
+       {       "ep8_rx", 2,    },
+       {       "ep9_tx", 2,    },
+       {       "ep9_rx", 2,    },
+       {       "ep10_tx", 2,   },
+       {       "ep10_rx", 2,   },
+       {       "ep11_tx", 2,   },
+       {       "ep11_rx", 2,   },
+       {       "ep12_tx", 2,   },
+       {       "ep12_rx", 2,   },
+       {       "ep13_tx", 2,   },
+       {       "ep13_rx", 2,   },
+       {       "ep14_tx", 2,   },
+       {       "ep14_rx", 2,   },
+       {       "ep15_tx", 2,   },
+       {       "ep15_rx", 2,   },
+};
+
+static struct musb_hdrc_config musb_config = {
+       .multipoint     = 1,
+       .dyn_fifo       = 1,
+       .soft_con       = 1,
+       .dma            = 1,
+       .num_eps        = 16,
+       .dma_channels   = 7,
+       .dma_req_chan   = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3),
+       .ram_bits       = 12,
+       .eps_bits       = musb_eps,
+};
+
+static struct musb_hdrc_platform_data musb_plat = {
+#ifdef CONFIG_USB_MUSB_OTG
+       .mode           = MUSB_OTG,
+#elif defined(CONFIG_USB_MUSB_HDRC_HCD)
+       .mode           = MUSB_HOST,
+#elif defined(CONFIG_USB_GADGET_MUSB_HDRC)
+       .mode           = MUSB_PERIPHERAL,
+#endif
+       /* .clock is set dynamically */
+       .set_clock      = musb_set_clock,
+       .config         = &musb_config,
+
+       /* REVISIT charge pump on TWL4030 can supply up to
+        * 100 mA ... but this value is board-specific, like
+        * "mode", and should be passed to usb_musb_init().
+        */
+       .power          = 50,                   /* up to 100 mA */
+};
+
+static u64 musb_dmamask = DMA_32BIT_MASK;
+
+static struct platform_device musb_device = {
+       .name           = "musb_hdrc",
+       .id             = -1,
+       .dev = {
+               .dma_mask               = &musb_dmamask,
+               .coherent_dma_mask      = DMA_32BIT_MASK,
+               .platform_data          = &musb_plat,
+       },
+       .num_resources  = ARRAY_SIZE(musb_resources),
+       .resource       = musb_resources,
+};
+
+#ifdef CONFIG_NOP_USB_XCEIV
+static u64 nop_xceiv_dmamask = DMA_32BIT_MASK;
+
+static struct platform_device nop_xceiv_device = {
+       .name           = "nop_usb_xceiv",
+       .id             = -1,
+       .dev = {
+               .dma_mask               = &nop_xceiv_dmamask,
+               .coherent_dma_mask      = DMA_32BIT_MASK,
+               .platform_data          = NULL,
+       },
+};
+#endif
+
+void __init usb_musb_init(void)
+{
+       if (cpu_is_omap243x())
+               musb_resources[0].start = OMAP243X_HS_BASE;
+       else
+               musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
+       musb_resources[0].end = musb_resources[0].start + SZ_8K - 1;
+
+       /*
+        * REVISIT: This line can be removed once all the platforms using
+        * musb_core.c have been converted to use use clkdev.
+        */
+       musb_plat.clock = "ick";
+
+#ifdef CONFIG_NOP_USB_XCEIV
+       if (platform_device_register(&nop_xceiv_device) < 0) {
+               printk(KERN_ERR "Unable to register NOP-XCEIV device\n");
+               return;
+       }
+#endif
+
+       if (platform_device_register(&musb_device) < 0) {
+               printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n");
+               return;
+       }
+}
index e033e51d4bad0594fb1800ff46cbbb322f749af2..69f0ceed500bd174467e3b1cd7e579d160c9cc9e 100644 (file)
 #define UDC_BASE                       OMAP2_UDC_BASE
 #define OMAP_OHCI_BASE                 OMAP2_OHCI_BASE
 
+#ifdef CONFIG_USB_MUSB_SOC
+extern void usb_musb_init(void);
+#else
+static inline void usb_musb_init(void)
+{
+}
+#endif
+
 #endif
 
 void omap_usb_init(struct omap_usb_config *pdata);