3 files changed, 8 insertions, 2 deletions

diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
index 19de03b074e3..e61afd922766 100644
--- a/arch/arm/mach-omap1/usb.c
+++ b/arch/arm/mach-omap1/usb.c
@@ -29,6 +29,8 @@
 #include <plat/mux.h>
 #include <plat/usb.h>
 
+#include "common.h"
+
 /* These routines should handle the standard chip-specific modes
  * for usb0/1/2 ports, covering basic mux and transceiver setup.
  *
@@ -138,6 +140,7 @@ static inline void ohci_device_init(struct omap_usb_config *pdata)
         if (cpu_is_omap7xx())
                 ohci_resources[1].start = INT_7XX_USB_HHC_1;
         pdata->ohci_device = &ohci_device;
+        pdata->ocpi_enable = &ocpi_enable;
 }
 
 #else
diff --git a/arch/arm/plat-omap/include/plat/board.h b/arch/arm/plat-omap/include/plat/board.h
index d5eb4c87db9d..4814c5b65306 100644
--- a/arch/arm/plat-omap/include/plat/board.h
+++ b/arch/arm/plat-omap/include/plat/board.h
@@ -91,6 +91,8 @@ struct omap_usb_config {
         u32 (*usb0_init)(unsigned nwires, unsigned is_device);
         u32 (*usb1_init)(unsigned nwires);
         u32 (*usb2_init)(unsigned nwires, unsigned alt_pingroup);
+
+        int (*ocpi_enable)(void);
 };
 
 struct omap_lcd_config {
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 96451e41ee8a..71229cb97e3e 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -205,8 +205,9 @@ static int ohci_omap_init(struct usb_hcd *hcd)
         need_transceiver = need_transceiver
                         || machine_is_omap_h2() || machine_is_omap_h3();
 
-        if (cpu_is_omap16xx())
-                ocpi_enable();
+        /* XXX OMAP16xx only */
+        if (config->ocpi_enable)
+                config->ocpi_enable();
 
 #ifdef  CONFIG_USB_OTG
         if (need_transceiver) {