Hi Marc, On Fri, Oct 29, 2010 at 10:48:28AM +0200, Marc Kleine-Budde wrote: > From b0040e8d011cf586c8095f7c46b7a53889140a2a Mon Sep 17 00:00:00 2001 > From: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> > Date: Fri, 29 Oct 2010 10:38:59 +0200 > Subject: [PATCH] USB: Fix FSL USB driver on non Open Firmware systems > MIME-Version: 1.0 > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: 8bit > > Commit 126512e3f274802ca65ebeca8660237f0361ad48 added support for FSL's USB > controller on powerpc. In this commit the Open Firmware code was selected > and compiled unconditionally. > > This breaks on ARM systems from FSL which use the same driver (.i.e. the i.MX > series), because ARM don't have OF support (yet). This patch fixes the problem > by only selecting the OF code on systems if Open Firmware support. s/if/with/, no? Thanks Uwe > > Reported-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> > Compile-Tested-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> > --- > drivers/usb/gadget/Kconfig | 2 +- > drivers/usb/host/Kconfig | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig > index b739ca8..607d0db 100644 > --- a/drivers/usb/gadget/Kconfig > +++ b/drivers/usb/gadget/Kconfig > @@ -158,7 +158,7 @@ config USB_GADGET_FSL_USB2 > boolean "Freescale Highspeed USB DR Peripheral Controller" > depends on FSL_SOC || ARCH_MXC > select USB_GADGET_DUALSPEED > - select USB_FSL_MPH_DR_OF > + select USB_FSL_MPH_DR_OF if OF > help > Some of Freescale PowerPC processors have a High Speed > Dual-Role(DR) USB controller, which supports device mode. > diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig > index bf2e7d2..66b2002 100644 > --- a/drivers/usb/host/Kconfig > +++ b/drivers/usb/host/Kconfig > @@ -121,7 +121,7 @@ config USB_EHCI_FSL > bool "Support for Freescale on-chip EHCI USB controller" > depends on USB_EHCI_HCD && FSL_SOC > select USB_EHCI_ROOT_HUB_TT > - select USB_FSL_MPH_DR_OF > + select USB_FSL_MPH_DR_OF if OF > ---help--- > Variation of ARC USB block used in some Freescale chips. > > -- > 1.7.2.3 > > -- > Pengutronix e.K. | Marc Kleine-Budde | > Industrial Linux Solutions | Phone: +49-231-2826-924 | > Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | > Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | > -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ | -- 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
