Hi,
+Alan Stern
On Tue, Apr 10, 2012 at 06:35:38PM -0600, Paul Walmsley wrote:
> 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.
>
> Also interesting is that drivers/usb/host/ohci-nxp.c contains a stub
> for ocpi_enable() - perhaps the NXP chips use a similar OCPI IP block?
>
> Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
> Cc: Roland Stigge <stigge@xxxxxxxxx>
> Cc: Felipe Balbi <balbi@xxxxxx>
> Cc: Anand Gadiyar <gadiyar@xxxxxx>
FWIW:
Acked-by: Felipe Balbi <balbi@xxxxxx>
ideally ocpi.c would be a platform_driver
> ---
> arch/arm/mach-omap1/usb.c | 3 +++
> arch/arm/plat-omap/include/plat/board.h | 2 ++
> drivers/usb/host/ohci-omap.c | 5 +++--
> 3 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/usb.c b/arch/arm/mach-omap1/usb.c
> index 19de03b..e61afd9 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 d5eb4c8..4814c5b 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 96451e4..71229cb 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) {
>
>
--
balbi
Attachment:
signature.asc
Description: Digital signature
