#include <linux/delay.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
-#include <asm/io.h>
-#include <mach/mux.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>
-#ifdef CONFIG_USB_MUSB_SOC
static struct resource musb_resources[] = {
- [0] = {
- .start = cpu_is_omap34xx()
- ? OMAP34XX_HSUSB_OTG_BASE
- : OMAP243X_HS_BASE,
- .end = cpu_is_omap34xx()
- ? OMAP34XX_HSUSB_OTG_BASE + SZ_8K - 1
- : OMAP243X_HS_BASE + SZ_8K - 1,
+ [0] = { /* start and end set dynamically */
.flags = IORESOURCE_MEM,
},
[1] = { /* general IRQ */
.dyn_fifo = 1,
.soft_con = 1,
.dma = 1,
- .num_eps = 32,
+ .num_eps = 16,
.dma_channels = 7,
.dma_req_chan = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3),
.ram_bits = 12,
#elif defined(CONFIG_USB_GADGET_MUSB_HDRC)
.mode = MUSB_PERIPHERAL,
#endif
- .clock = cpu_is_omap34xx()
- ? "hsotgusb_ick"
- : "usbhs_ick",
+ /* .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 = ~(u32)0;
+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 = 0xffffffff,
+ .coherent_dma_mask = DMA_32BIT_MASK,
.platform_data = &musb_plat,
},
.num_resources = ARRAY_SIZE(musb_resources),
.resource = musb_resources,
};
-#endif
+#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)
{
-#ifdef CONFIG_USB_MUSB_SOC
+ if (cpu_is_omap243x()) {
+ musb_resources[0].start = OMAP243X_HS_BASE;
+ musb_plat.clock = "usbhs_ick";
+ } else {
+ musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
+ musb_plat.clock = "hsotgusb_ick";
+ }
+
+ musb_resources[0].end = musb_resources[0].start + SZ_8K - 1;
+
+#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;
}
-#endif
}
-