From: Mika Laitio <lamikr@pilppa.org>
Date: Tue, 10 Feb 2009 22:21:03 +0000 (+0200)
Subject: h63xx: usb gadget driver support.
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6529092459d9c0caae0cb419b3e748c2ce7e6f53;p=linux-2.6-omap-h63xx.git

h63xx: usb gadget driver support.
---

diff --git a/arch/arm/mach-omap1/board-h6300.c b/arch/arm/mach-omap1/board-h6300.c
index 146198fee65..04faa97e1a6 100644
--- 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 57d9641c6bf..9d86b324988 100644
--- 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()
 		);
 }