From patchwork Wed Mar 11 10:20:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Brownell X-Patchwork-Id: 11107 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2BAiPFE017485 for ; Wed, 11 Mar 2009 10:44:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754947AbZCKKnt (ORCPT ); Wed, 11 Mar 2009 06:43:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755530AbZCKKnt (ORCPT ); Wed, 11 Mar 2009 06:43:49 -0400 Received: from n7.bullet.mud.yahoo.com ([216.252.100.58]:25545 "HELO n7.bullet.mud.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755478AbZCKKnr (ORCPT ); Wed, 11 Mar 2009 06:43:47 -0400 X-Greylist: delayed 378 seconds by postgrey-1.27 at vger.kernel.org; Wed, 11 Mar 2009 06:43:47 EDT Received: from [209.191.108.97] by n7.bullet.mud.yahoo.com with NNFMP; 11 Mar 2009 10:37:27 -0000 Received: from [68.142.201.246] by t4.bullet.mud.yahoo.com with NNFMP; 11 Mar 2009 10:37:27 -0000 Received: from [127.0.0.1] by omp407.mail.mud.yahoo.com with NNFMP; 11 Mar 2009 10:37:27 -0000 X-Yahoo-Newman-Id: 856860.78262.bm@omp407.mail.mud.yahoo.com Received: (qmail 92806 invoked from network); 11 Mar 2009 10:37:27 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=pacbell.net; h=Received:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Subject:Date:User-Agent:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-Disposition:Message-Id; b=wAWQ9fvbqSYb+WjC7mPI87na4SzPvNllzL+03Se1cAZhSvx8v73cgUnpLaCf8n8bYkZxlNbnqHMGQz0bVy6saH1p5qx4Kt14jzGJYUv1ut2xlr9lhkauTwCyBJwCHG6ahjNc0bilh65BBr//iFaKQXmB4Ed3DlSGgobMzRhDYL8= ; Received: from unknown (HELO pogo) (david-b@69.226.224.20 with plain) by smtp108.sbc.mail.sp1.yahoo.com with SMTP; 11 Mar 2009 10:37:26 -0000 X-YMail-OSG: smzZZ.8VM1mP_opoxv9cbzQFjTg4cuFYSYZrrnfztIL4m79hpj9wPQTymk_lxVRVlmruN7RxsLC89v_s0hW05xjxTu_mjTPfDDOQDWQKOzwa4HviKqE8ovP5hZH4XlkPE1Xa9jp8kmaBt0cUTOSDTAIL7f3_HdCO20hRiljwsdksVkdWaXrlZ01ojDlpH408jg-- X-Yahoo-Newman-Property: ymail-3 From: David Brownell To: OMAP Subject: [patch 2.6.29-rc7-omap] OMAP1: OMAP_TAG_USB buildfix (OSK) Date: Wed, 11 Mar 2009 02:20:05 -0800 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200903110320.06011.david-b@pacbell.net> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: David Brownell 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. Signed-off-by: David Brownell --- arch/arm/mach-omap1/board-osk.c | 3 ++- arch/arm/plat-omap/include/mach/usb.h | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) -- 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); /*-------------------------------------------------------------------------*/