diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/gadget/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/omap_udc.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 1a72715bce8a..dd4cd5a51370 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
@@ -190,7 +190,7 @@ config USB_LH7A40X | |||
190 | config USB_GADGET_OMAP | 190 | config USB_GADGET_OMAP |
191 | boolean "OMAP USB Device Controller" | 191 | boolean "OMAP USB Device Controller" |
192 | depends on ARCH_OMAP | 192 | depends on ARCH_OMAP |
193 | select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3 | 193 | select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3 || MACH_OMAP_H4_OTG |
194 | help | 194 | help |
195 | Many Texas Instruments OMAP processors have flexible full | 195 | Many Texas Instruments OMAP processors have flexible full |
196 | speed USB device controllers, with support for up to 30 | 196 | speed USB device controllers, with support for up to 30 |
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index bb54cca4c543..34e9e393f929 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
@@ -2313,6 +2313,13 @@ static int proc_otg_show(struct seq_file *s) | |||
2313 | 2313 | ||
2314 | tmp = omap_readl(OTG_REV); | 2314 | tmp = omap_readl(OTG_REV); |
2315 | if (cpu_is_omap24xx()) { | 2315 | if (cpu_is_omap24xx()) { |
2316 | /* | ||
2317 | * REVISIT: Not clear how this works on OMAP2. trans | ||
2318 | * is ANDed to produce bits 7 and 8, which might make | ||
2319 | * sense for USB_TRANSCEIVER_CTRL on OMAP1, | ||
2320 | * but with CONTROL_DEVCONF, these bits have something to | ||
2321 | * do with the frame adjustment counter and McBSP2. | ||
2322 | */ | ||
2316 | ctrl_name = "control_devconf"; | 2323 | ctrl_name = "control_devconf"; |
2317 | trans = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); | 2324 | trans = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); |
2318 | } else { | 2325 | } else { |