From: Felipe Balbi <me@felipebalbi.com>
To: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org, Felipe Balbi <felipe.balbi@nokia.com>,
David Brownell <dbrownell@users.sourceforge.net>
Subject: Re: [PATCH 3/3] musb_hdrc: Build usb-musb based on config entry, clean-up Makefile
Date: Thu, 12 Feb 2009 21:31:12 +0200 [thread overview]
Message-ID: <20090212193111.GN10711@frodo> (raw)
In-Reply-To: <20090212191719.19766.24459.stgit@localhost>
On Thu, Feb 12, 2009 at 11:17:19AM -0800, Tony Lindgren wrote:
> Build usb-musb based on config entry, clean-up Makefile
>
> Cc: Felipe Balbi <felipe.balbi@nokia.com>
> Cc: David Brownell <dbrownell@users.sourceforge.net>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
Makes sense to me
> ---
> arch/arm/mach-omap2/Makefile | 17 ++++++-----------
> arch/arm/mach-omap2/usb-musb.c | 7 -------
> arch/arm/plat-omap/include/mach/usb.h | 7 +++++++
> 3 files changed, 13 insertions(+), 18 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
> index 631166d..fad8af4 100644
> --- a/arch/arm/mach-omap2/Makefile
> +++ b/arch/arm/mach-omap2/Makefile
> @@ -44,27 +44,24 @@ obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o board-h4-mmc.o
> obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o \
> board-2430sdp-flash.o \
> mmc-twl4030.o \
> - usb-musb.o \
> usb-ehci.o
> obj-$(CONFIG_MACH_OMAP2EVM) += board-omap2evm.o \
> mmc-twl4030.o
> obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \
> mmc-twl4030.o \
> - usb-musb.o \
> usb-ehci.o \
> board-3430sdp-flash.o
> obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \
> mmc-twl4030.o \
> - usb-musb.o usb-ehci.o \
> + usb-ehci.o \
> board-omap3evm-flash.o \
> twl4030-generic-scripts.o
> obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \
> - usb-musb.o usb-ehci.o \
> + usb-ehci.o \
> mmc-twl4030.o \
> twl4030-generic-scripts.o
> obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o \
> - mmc-twl4030.o \
> - usb-musb.o
> + mmc-twl4030.o
> obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o \
> board-apollon-mmc.o \
> board-apollon-keys.o
> @@ -80,19 +77,17 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
> board-rx51-sdram.o \
> board-rx51-video.o \
> board-rx51-peripherals.o \
> - mmc-twl4030.o \
> - usb-musb.o
> + mmc-twl4030.o
>
> obj-$(CONFIG_MACH_OVERO) += board-overo.o \
> mmc-twl4030.o \
> - usb-musb.o \
> usb-ehci.o \
> twl4030-generic-scripts.o
> obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \
> mmc-twl4030.o \
> - usb-musb.o \
> usb-ehci.o
>
> -# TUSB 6010 chips
> +# Platform specific device init code
> +obj-$(CONFIG_USB_MUSB_SOC) += usb-musb.o
> obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o
>
> diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
> index 897c07d..327af7d 100644
> --- a/arch/arm/mach-omap2/usb-musb.c
> +++ b/arch/arm/mach-omap2/usb-musb.c
> @@ -33,7 +33,6 @@
> #include <mach/mux.h>
> #include <mach/usb.h>
>
> -#ifdef CONFIG_USB_MUSB_SOC
> static struct resource musb_resources[] = {
> [0] = { /* start and end set dynamically */
> .flags = IORESOURCE_MEM,
> @@ -146,13 +145,9 @@ static struct platform_device musb_device = {
> .num_resources = ARRAY_SIZE(musb_resources),
> .resource = musb_resources,
> };
> -#endif
> -
>
> void __init usb_musb_init(void)
> {
> -#ifdef CONFIG_USB_MUSB_SOC
> -
> if (cpu_is_omap243x()) {
> musb_resources[0].start = OMAP243X_HS_BASE;
> musb_plat.clock = "usbhs_ick";
> @@ -167,6 +162,4 @@ void __init usb_musb_init(void)
> printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n");
> return;
> }
> -#endif
> }
> -
> diff --git a/arch/arm/plat-omap/include/mach/usb.h b/arch/arm/plat-omap/include/mach/usb.h
> index 7d7b2b0..e69c5ad 100644
> --- a/arch/arm/plat-omap/include/mach/usb.h
> +++ b/arch/arm/plat-omap/include/mach/usb.h
> @@ -27,7 +27,14 @@
> #define UDC_BASE OMAP2_UDC_BASE
> #define OMAP_OHCI_BASE OMAP2_OHCI_BASE
>
> +#ifdef CONFIG_USB_MUSB_SOC
> extern void usb_musb_init(void);
> +#else
> +static inline void usb_musb_init(void)
> +{
> +}
> +#endif
> +
> extern void usb_ehci_init(void);
>
> #endif
>
> --
> 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
--
balbi
next prev parent reply other threads:[~2009-02-12 19:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-12 19:16 [PATCH 0/3] musb_hdrc: Clean-up init code for mainline merge Tony Lindgren
2009-02-12 19:16 ` [PATCH 1/3] musb_hdrc: Set musb_resources dynamically Tony Lindgren
2009-02-12 19:28 ` Felipe Balbi
2009-02-12 19:17 ` [PATCH 2/3] musb_hdrc: Clean-up MUSB init code for next merge window Tony Lindgren
2009-02-12 19:30 ` Felipe Balbi
2009-02-12 19:44 ` Tony Lindgren
2009-02-12 19:17 ` [PATCH 3/3] musb_hdrc: Build usb-musb based on config entry, clean-up Makefile Tony Lindgren
2009-02-12 19:31 ` Felipe Balbi [this message]
2009-02-12 19:21 ` [PATCH 0/3] musb_hdrc: Clean-up init code for mainline merge Tony Lindgren
2009-02-12 19:35 ` Felipe Balbi
2009-02-13 20:50 ` David Brownell
2009-02-12 20:49 ` David Brownell
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=20090212193111.GN10711@frodo \
--to=me@felipebalbi.com \
--cc=dbrownell@users.sourceforge.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