On Monday 22 December 2008, Greg KH wrote: > > > It relies on patches in your gregkh-04-usb/ queue ... I see those > > patches there still (creating drivers/usb/otg). When you say the > > $SUBJECT patch didn't apply, which queue were you referring to? > > And what were the errors? > > My gregkh-04-usb/ queue. > > If it now applies, that's odd, care to resend it? The issue was just that the patch adding Blackfin support added the charactes "ADI, " to the Makefile. Updated version appended. - Dave ===== From: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> The DaVinci code had an implementation of the OTG transceiver glue too; make it use the new-standard one. Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx> --- Depends on the drivers/usb/otg patches queued for 2.6.29 and also in the current OMAP tree. arch/arm/mach-davinci/usb.c | 23 ----------------------- drivers/usb/musb/Kconfig | 1 + 2 files changed, 1 insertion(+), 23 deletions(-) --- a/arch/arm/mach-davinci/usb.c +++ b/arch/arm/mach-davinci/usb.c @@ -76,29 +76,6 @@ static struct platform_device usb_dev = .num_resources = ARRAY_SIZE(usb_resources), }; -#ifdef CONFIG_USB_MUSB_OTG - -static struct otg_transceiver *xceiv; - -struct otg_transceiver *otg_get_transceiver(void) -{ - if (xceiv) - get_device(xceiv->dev); - return xceiv; -} -EXPORT_SYMBOL(otg_get_transceiver); - -int otg_set_transceiver(struct otg_transceiver *x) -{ - if (xceiv && x) - return -EBUSY; - xceiv = x; - return 0; -} -EXPORT_SYMBOL(otg_set_transceiver); - -#endif - void __init setup_usb(unsigned mA, unsigned potpgt_msec) { usb_data.power = mA / 2; --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -11,6 +11,7 @@ config USB_MUSB_HDRC depends on (USB || USB_GADGET) && HAVE_CLK depends on !SUPERH select TWL4030_USB if MACH_OMAP_3430SDP + select USB_OTG_UTILS tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)' help Say Y here if your system has a dual role high speed USB -- 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