h63xx: usb gadget driver support.

diff --git a/arch/arm/mach-omap1/board-h6300.c b/arch/arm/mach-omap1/board-h6300.c
index 146198fee65bcbe5ab62396ad357f539b49173fb..04faa97e1a6428977c203cab6af4dd8750e17ca4 100644 (file)
--- a/arch/arm/mach-omap1/board-h6300.c
+++ b/arch/arm/mach-omap1/board-h6300.c
@@ -47,9 +47,17 @@ static struct omap_uart_config h6300_uart_config __initdata = {
        .enabled_uarts  = ((1 << 0) | (1 << 1) | (1 << 2)),
 };
 
+/* assume no Mini-AB port */
+static struct omap_usb_config h6300_usb_config __initdata = {
+       .register_dev   = 1,
+       .hmc_mode       = 0,
+       .pins[0]        = 0,
+};
+
 static struct omap_board_config_kernel h6300_config[] = {
        { OMAP_TAG_LCD,         &h6300_lcd_config },
        { OMAP_TAG_UART,        &h6300_uart_config },
+       { OMAP_TAG_USB,         &h6300_usb_config },
 };
 
 static void __init h6300_init_irq(void)

diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 57d9641c6bf8c7bf4ed968a714ed8bd168e3289e..9d86b3249889f5545daeb96149805b283bbf3525 100644 (file)
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -61,7 +61,11 @@
 #undef USB_TRACE
 
 /* bulk DMA seems to be behaving for both IN and OUT */
+#ifdef CONFIG_MACH_OMAP_H6300
+#undef USE_DMA
+#else
 #define        USE_DMA
+#endif
 
 /* ISO too */
 #define        USE_ISO
@@ -2098,6 +2102,7 @@ static inline int machine_without_vbus_sense(void)
                || machine_is_omap_h4()
 #endif
                || machine_is_sx1()
+               || machine_is_omap_h6300()
                );
 }