ARM: OMAP1: OHCI: use platform_data fn ptr to enable OCPI bus

The OMAP1 OHCI driver needs to enable the OCPI IP block before it can
work.  Previously, the driver was simply calling a symbol defined in
the OMAP platform code, but this is incorrect: drivers should be fully
decoupled from platform and architecture code.

So instead, modify the driver to call through a platform_data function
pointer instead.  We skip any DT aspect, since OMAP1 is not scheduled
to be converted to DT in the near future.

This resolves the following sparse warning:

It also gets rid of a cpu_is_omap16xx() call in a driver.

In the long term, it probably makes sense to move the OCPI bus code to
somewhere under drivers/.  This should avoid the whole platform_data/DT
issue with this function.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Anand Gadiyar <gadiyar@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>

diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
index 19de03b074e38ee9ceef523b27474708ae1ec3a4..e61afd9227662f123620a3243ed0a92d89cbe30b 100644 (file)
--- 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 d5eb4c87db9dd146af1443cdc2dd85f64b7fe292..4814c5b653068a94f14fcfa941b76c0b232c2f50 100644 (file)
--- 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 96451e41ee8ac5f16692f8862ce4b33491edb3d2..71229cb97e3e54dd1788bdcf715d286f0e018477 100644 (file)
--- 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) {