From: David Brownell <david-b@pacbell.net>
To: OMAP <linux-omap@vger.kernel.org>
Subject: [patch 2.6.29-rc7-omap] OMAP1: OMAP_TAG_USB buildfix (OSK)
Date: Wed, 11 Mar 2009 02:20:05 -0800 [thread overview]
Message-ID: <200903110320.06011.david-b@pacbell.net> (raw)
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.
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);
/*-------------------------------------------------------------------------*/
next reply other threads:[~2009-03-11 10:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-11 10:20 David Brownell [this message]
2009-03-11 15:28 ` [patch 2.6.29-rc7-omap] OMAP1: OMAP_TAG_USB buildfix (OSK) Felipe Balbi
2009-03-11 16:19 ` Tony Lindgren
2009-03-11 16:32 ` [APPLIED] " Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200903110320.06011.david-b@pacbell.net \
--to=david-b@pacbell.net \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.