From: David Brownell <david-b@pacbell.net>
To: felipe.balbi@nokia.com
Cc: linux-omap@vger.kernel.org, tony@atomide.com
Subject: Re: [PATCH] omap: get rid of OMAP_TAG_USB
Date: Tue, 11 Nov 2008 22:20:33 -0800 [thread overview]
Message-ID: <200811112220.33960.david-b@pacbell.net> (raw)
In-Reply-To: <20081024215805.GD10733@gandalf.research.nokia.com>
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@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2008-11-12 6:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-25 14:22 [PATCH 0/1] omap tag removal Felipe Balbi
2008-09-25 14:22 ` [PATCH] omap: get rid of OMAP_TAG_USB Felipe Balbi
2008-10-10 12:39 ` Felipe Balbi
2008-10-24 21:58 ` Felipe Balbi
2008-11-12 6:20 ` David Brownell [this message]
2008-11-12 11:47 ` Felipe Balbi
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=200811112220.33960.david-b@pacbell.net \
--to=david-b@pacbell.net \
--cc=felipe.balbi@nokia.com \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox