On Friday 24 October 2008, Felipe Balbi wrote: > > --- a/arch/arm/plat-omap/include/mach/usb.h > > +++ b/arch/arm/plat-omap/include/mach/usb.h > > @@ -29,6 +29,7 @@ > > > > void __init usb_musb_init(void); > > void __init usb_ehci_init(void); > > +void omap_usb_init(struct omap_usb_config *pdata); > > > > #endif > > That "#endif" is for the !OMAP1 branch ... so this patch couldn't built on on any OMAP1 platform at all. And for OSK, you put the USB init in with the Mistral-specific init ... but most OSKs don't connect to a Mistral. The following patch gets it to build OK for my OSK, but then omap_udc hit some new locking bug. Sigh. - Dave --- osk.orig/arch/arm/mach-omap1/board-osk.c 2008-11-11 20:32:50.000000000 -0800 +++ osk/arch/arm/mach-omap1/board-osk.c 2008-11-11 20:19:33.000000000 -0800 @@ -544,7 +544,6 @@ static void __init osk_mistral_init(void i2c_register_board_info(1, mistral_i2c_board_info, ARRAY_SIZE(mistral_i2c_board_info)); - omap_usb_init(&osk_usb_config); platform_add_devices(mistral_devices, ARRAY_SIZE(mistral_devices)); } #else @@ -584,6 +583,7 @@ static void __init osk_init(void) omap_serial_init(); omap_register_i2c_bus(1, 400, osk_i2c_board_info, ARRAY_SIZE(osk_i2c_board_info)); + omap_usb_init(&osk_usb_config); osk_mistral_init(); } --- osk.orig/arch/arm/plat-omap/include/mach/usb.h 2008-11-11 20:32:50.000000000 -0800 +++ osk/arch/arm/plat-omap/include/mach/usb.h 2008-11-11 20:27:06.000000000 -0800 @@ -29,10 +29,10 @@ void __init usb_musb_init(void); void __init usb_ehci_init(void); -void omap_usb_init(struct omap_usb_config *pdata); - #endif +void omap_usb_init(struct omap_usb_config *pdata); + /*-------------------------------------------------------------------------*/ /* -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
