1 files changed, 30 insertions, 16 deletions

diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c
index 509f2ed99e21..d3bf17cd36f3 100644
--- a/arch/arm/plat-omap/usb.c
+++ b/arch/arm/plat-omap/usb.c
@@ -33,10 +33,10 @@
 #include <asm/system.h>
 #include <mach/hardware.h>
 
-#include <mach/control.h>
-#include <mach/mux.h>
-#include <mach/usb.h>
-#include <mach/board.h>
+#include <plat/control.h>
+#include <plat/mux.h>
+#include <plat/usb.h>
+#include <plat/board.h>
 
 #ifdef CONFIG_ARCH_OMAP1
 
@@ -137,7 +137,13 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device)
         if (is_device) {
                 if (cpu_is_omap24xx())
                         omap_cfg_reg(J20_24XX_USB0_PUEN);
-                else
+                else if (cpu_is_omap7xx()) {
+                        omap_cfg_reg(AA17_7XX_USB_DM);
+                        omap_cfg_reg(W16_7XX_USB_PU_EN);
+                        omap_cfg_reg(W17_7XX_USB_VBUSI);
+                        omap_cfg_reg(W18_7XX_USB_DMCK_OUT);
+                        omap_cfg_reg(W19_7XX_USB_DCRST);
+                } else
                         omap_cfg_reg(W4_USB_PUEN);
         }
 
@@ -159,11 +165,14 @@ static u32 __init omap_usb0_init(unsigned nwires, unsigned is_device)
                  *  - OTG support on this port not yet written
                  */
 
-                l = omap_readl(USB_TRANSCEIVER_CTRL);
-                l &= ~(7 << 4);
-                if (!is_device)
-                        l |= (3 << 1);
-                omap_writel(l, USB_TRANSCEIVER_CTRL);
+                /* Don't do this for omap7xx -- it causes USB to not work correctly */
+                if (!cpu_is_omap7xx()) {
+                        l = omap_readl(USB_TRANSCEIVER_CTRL);
+                        l &= ~(7 << 4);
+                        if (!is_device)
+                                l |= (3 << 1);
+                        omap_writel(l, USB_TRANSCEIVER_CTRL);
+                }
 
                 return 3 << 16;
         }
@@ -603,7 +612,12 @@ omap_otg_init(struct omap_usb_config *config)
         if (config->otg || config->register_dev) {
                 syscon &= ~DEV_IDLE_EN;
                 udc_device.dev.platform_data = config;
-                /* FIXME patch IRQ numbers for omap730 */
+                /* IRQ numbers for omap7xx */
+                if(cpu_is_omap7xx()) {
+                        udc_resources[1].start = INT_7XX_USB_GENI;
+                        udc_resources[2].start = INT_7XX_USB_NON_ISO;
+                        udc_resources[3].start = INT_7XX_USB_ISO;
+                }
                 status = platform_device_register(&udc_device);
                 if (status)
                         pr_debug("can't register UDC device, %d\n", status);
@@ -614,8 +628,8 @@ omap_otg_init(struct omap_usb_config *config)
         if (config->otg || config->register_host) {
                 syscon &= ~HST_IDLE_EN;
                 ohci_device.dev.platform_data = config;
-                if (cpu_is_omap730())
-                        ohci_resources[1].start = INT_730_USB_HHC_1;
+                if (cpu_is_omap7xx())
+                        ohci_resources[1].start = INT_7XX_USB_HHC_1;
                 status = platform_device_register(&ohci_device);
                 if (status)
                         pr_debug("can't register OHCI device, %d\n", status);
@@ -626,8 +640,8 @@ omap_otg_init(struct omap_usb_config *config)
         if (config->otg) {
                 syscon &= ~OTG_IDLE_EN;
                 otg_device.dev.platform_data = config;
-                if (cpu_is_omap730())
-                        otg_resources[1].start = INT_730_USB_OTG;
+                if (cpu_is_omap7xx())
+                        otg_resources[1].start = INT_7XX_USB_OTG;
                 status = platform_device_register(&otg_device);
                 if (status)
                         pr_debug("can't register OTG device, %d\n", status);
@@ -731,7 +745,7 @@ static inline void omap_1510_usb_init(struct omap_usb_config *config) {}
 
 void __init omap_usb_init(struct omap_usb_config *pdata)
 {
-        if (cpu_is_omap730() || cpu_is_omap16xx() || cpu_is_omap24xx())
+        if (cpu_is_omap7xx() || cpu_is_omap16xx() || cpu_is_omap24xx())
                 omap_otg_init(pdata);
         else if (cpu_is_omap15xx())
                 omap_1510_usb_init(pdata);