Преглед изворни кода

USB: omap_udc: sync with OMAP tree

Sync up USB parts of the omap_udc support in mainline with the OMAP tree.
This patch addresses some OMAP2 differences ... there's another, with
respect to the double-buffering issue with PIO-IN in omap_ep_setup()
(which is now out of sync with the comments), but it's not clear right
now how to address that.

From: Tony Lindgren <tony@atomide.com>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Tony Lindgren пре 16 година
родитељ
комит
f1c9e151b1
2 измењених фајлова са 8 додато и 1 уклоњено
  1. 1 1
      drivers/usb/gadget/Kconfig
  2. 7 0
      drivers/usb/gadget/omap_udc.c

+ 1 - 1
drivers/usb/gadget/Kconfig

@@ -190,7 +190,7 @@ config USB_LH7A40X
 config USB_GADGET_OMAP
 config USB_GADGET_OMAP
 	boolean "OMAP USB Device Controller"
 	boolean "OMAP USB Device Controller"
 	depends on ARCH_OMAP
 	depends on ARCH_OMAP
-	select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
+	select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_H4_OTG
 	help
 	help
 	   Many Texas Instruments OMAP processors have flexible full
 	   Many Texas Instruments OMAP processors have flexible full
 	   speed USB device controllers, with support for up to 30
 	   speed USB device controllers, with support for up to 30

+ 7 - 0
drivers/usb/gadget/omap_udc.c

@@ -2313,6 +2313,13 @@ static int proc_otg_show(struct seq_file *s)
 
 
 	tmp = omap_readl(OTG_REV);
 	tmp = omap_readl(OTG_REV);
 	if (cpu_is_omap24xx()) {
 	if (cpu_is_omap24xx()) {
+		/*
+		 * REVISIT: Not clear how this works on OMAP2.  trans
+		 * is ANDed to produce bits 7 and 8, which might make
+		 * sense for USB_TRANSCEIVER_CTRL on OMAP1,
+		 * but with CONTROL_DEVCONF, these bits have something to
+		 * do with the frame adjustment counter and McBSP2.
+		 */
 		ctrl_name = "control_devconf";
 		ctrl_name = "control_devconf";
 		trans = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
 		trans = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
 	} else {
 	} else {