> The Blackfin MUSB is unable to support MUSB_ULPI_BUSCONTROL, so disable
> the code if the register is not defined. This fixes building again.
>
> Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Mike,
No complaints with this patch as is, but to get rid of the ifdefs,
do you think it would be better to use wrapper functions again?
Also, a general questions about MUSB on blackfins - is the limitation
because the ULPI access registers are completely missing on the blackfins,
or is it simply because we don't have the defines for blackfin.
Thanks,
Anand
> ---
> Note: this should go in for 2.6.34 since it fixes a
> regression to 2.6.33
>
> drivers/usb/musb/musb_core.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
> index b4bbf8f..1cc6e42 100644
> --- a/drivers/usb/musb/musb_core.c
> +++ b/drivers/usb/musb/musb_core.c
> @@ -2016,12 +2016,14 @@ bad_config:
> musb->xceiv->host = &hcd->self;
> hcd->power_budget = 2 * (plat->power ? : 250);
>
> +#ifdef MUSB_ULPI_BUSCONTROL
> /* program PHY to use external vBus if required */
> if (plat->extvbus) {
> busctl = musb_readb(musb->mregs, MUSB_ULPI_BUSCONTROL);
> busctl |= MUSB_ULPI_USE_EXTVBUS;
> musb_writeb(musb->mregs, MUSB_ULPI_BUSCONTROL, busctl);
> }
> +#endif
> }
>
> /* For the host-only role, we can activate right away.
> --
> 1.7.0.2
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
