| Message ID | 200903110320.06011.david-b@pacbell.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3a65a9be0aaeeb5a9d89d6c62657adc38995abc2 |
| Headers | show |
On Wed, Mar 11, 2009 at 02:20:05AM -0800, David Brownell wrote: > From: David Brownell <dbrownell@users.sourceforge.net> > > Build fix: > > CC arch/arm/mach-omap1/board-osk.o > arch/arm/mach-omap1/board-osk.c: In function 'osk_mistral_init': > arch/arm/mach-omap1/board-osk.c:512: error: implicit declaration of function 'omap_usb_init' > make[1]: *** [arch/arm/mach-omap1/board-osk.o] Error 1 > > The error is twofold. First, USB is on the mainboard, not the Mistral card; > that's specific to the OSK. Second, header goofage -- hurts all OMAP1 boards. > > I'm puzzled by the notion tha the "OMAP1: get rid of OMAP_TAG_USB" patch could > have been compile-tested. it actually was for all omap1 defconfigs. Weird that these came only now :-(
* David Brownell <david-b@pacbell.net> [090311 03:44]: > From: David Brownell <dbrownell@users.sourceforge.net> > > Build fix: > > CC arch/arm/mach-omap1/board-osk.o > arch/arm/mach-omap1/board-osk.c: In function 'osk_mistral_init': > arch/arm/mach-omap1/board-osk.c:512: error: implicit declaration of function 'omap_usb_init' > make[1]: *** [arch/arm/mach-omap1/board-osk.o] Error 1 > > The error is twofold. First, USB is on the mainboard, not the Mistral card; > that's specific to the OSK. Second, header goofage -- hurts all OMAP1 boards. > > I'm puzzled by the notion tha the "OMAP1: get rid of OMAP_TAG_USB" patch could > have been compile-tested. Hmm, I built it on all boards, but maybe that was against the mainline tree for omap-upstream patches. It's also possible that I hosed the osk patch while refreshing the original patch.. Oh well, never trust me for manually merging patches right :) I'll apply this and update the omap-upstream patch accordingly. Tony > Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> > --- > arch/arm/mach-omap1/board-osk.c | 3 ++- > arch/arm/plat-omap/include/mach/usb.h | 10 +++++----- > 2 files changed, 7 insertions(+), 6 deletions(-) > > --- a/arch/arm/mach-omap1/board-osk.c > +++ b/arch/arm/mach-omap1/board-osk.c > @@ -509,7 +509,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 > @@ -541,6 +540,8 @@ static void __init osk_init(void) > l |= (3 << 1); > omap_writel(l, USB_TRANSCEIVER_CTRL); > > + omap_usb_init(&osk_usb_config); > + > /* irq for tps65010 chip */ > /* bootloader effectively does: omap_cfg_reg(U19_1610_MPUIO1); */ > if (gpio_request(OMAP_MPUIO(1), "tps65010") == 0) > --- a/arch/arm/plat-omap/include/mach/usb.h > +++ b/arch/arm/plat-omap/include/mach/usb.h > @@ -33,9 +33,7 @@ extern void usb_musb_init(void); > static inline void usb_musb_init(void) > { > } > -#endif > - > -void omap_usb_init(struct omap_usb_config *pdata); > +#endif /* !OMAP1 && !MUSB */ > > #if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_EHCI_HCD_MODULE) > extern void usb_ehci_init(void); > @@ -43,9 +41,11 @@ extern void usb_ehci_init(void); > static inline void usb_ehci_init(void) > { > } > -#endif > +#endif /* !OMAP1 && !EHCI */ > > -#endif > +#endif /* !OMAP1 */ > + > +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@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
This patch has been applied to the linux-omap by youw fwiendly patch wobot. Commit: 3a65a9be0aaeeb5a9d89d6c62657adc38995abc2 PatchWorks http://patchwork.kernel.org/patch/11107/ Git http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=3a65a9be0aaeeb5a9d89d6c62657adc38995abc2 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -509,7 +509,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 @@ -541,6 +540,8 @@ static void __init osk_init(void) l |= (3 << 1); omap_writel(l, USB_TRANSCEIVER_CTRL); + omap_usb_init(&osk_usb_config); + /* irq for tps65010 chip */ /* bootloader effectively does: omap_cfg_reg(U19_1610_MPUIO1); */ if (gpio_request(OMAP_MPUIO(1), "tps65010") == 0) --- a/arch/arm/plat-omap/include/mach/usb.h +++ b/arch/arm/plat-omap/include/mach/usb.h @@ -33,9 +33,7 @@ extern void usb_musb_init(void); static inline void usb_musb_init(void) { } -#endif - -void omap_usb_init(struct omap_usb_config *pdata); +#endif /* !OMAP1 && !MUSB */ #if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_EHCI_HCD_MODULE) extern void usb_ehci_init(void); @@ -43,9 +41,11 @@ extern void usb_ehci_init(void); static inline void usb_ehci_init(void) { } -#endif +#endif /* !OMAP1 && !EHCI */ -#endif +#endif /* !OMAP1 */ + +void omap_usb_init(struct omap_usb_config *pdata); /*-------------------------------------------------------------------------*/