On Fri, Aug 14, 2009 at 04:59:44PM +0200, Valentin Longchamp wrote: >> The controller is capable of USB on the go. This patch adds >> a driver to support all three of them. >> >> Users have to pass details about serial interface configuration in the >> platform data. >> >> The USB OTG core used here is the ARC core, so the driver should >> be renamed and probably be merged with ehci-fsl.c eventually. > > I have tested it with the new mxc-master branch from Sascha that is > going to be merged for 2.6.32-rc1, like (hopefully) this series, and > there is a small incompatibility. > > What is the general plan when two things on different systems change "at > the same time" ? Make things work for when both are merged ? [...] >> + if (cpu_is_mx31()) { >> + v = readl(IO_ADDRESS(OTG_BASE_ADDR + USBCTRL_OTGBASE_OFFSET)); > > OTG_BASE_ADDR is not defined anymore and should be replaced by > MX31_OTG_BASE_ADDR Hmm. The code applies to current mainline, and the name transition came in later. So I think there should be a separate patch in mxc-master to clean this up. Daniel -- 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