From patchwork Thu Feb 12 19:17:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 6901 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 n1CJGmZ5017818 for ; Thu, 12 Feb 2009 19:17:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757400AbZBLTR0 (ORCPT ); Thu, 12 Feb 2009 14:17:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757571AbZBLTR0 (ORCPT ); Thu, 12 Feb 2009 14:17:26 -0500 Received: from mho-01-bos.mailhop.org ([63.208.196.178]:60047 "EHLO mho-01-bos.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757400AbZBLTRZ (ORCPT ); Thu, 12 Feb 2009 14:17:25 -0500 Received: from c-69-181-40-92.hsd1.ca.comcast.net ([69.181.40.92] helo=[127.0.0.1]) by mho-01-bos.mailhop.org with esmtpa (Exim 4.68) (envelope-from ) id 1LXh3p-000FZU-II; Thu, 12 Feb 2009 19:17:22 +0000 X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 69.181.40.92 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+E58ohPP3ozZUtxxg9Bpji Subject: [PATCH 3/3] musb_hdrc: Build usb-musb based on config entry, clean-up Makefile To: linux-omap@vger.kernel.org From: Tony Lindgren Cc: Felipe Balbi , David Brownell Date: Thu, 12 Feb 2009 11:17:19 -0800 Message-ID: <20090212191719.19766.24459.stgit@localhost> In-Reply-To: <20090212191408.19766.62874.stgit@localhost> References: <20090212191408.19766.62874.stgit@localhost> User-Agent: Whatever/0.14.3.285.g62874 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Build usb-musb based on config entry, clean-up Makefile Cc: Felipe Balbi Cc: David Brownell Signed-off-by: Tony Lindgren --- 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(-) -- 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 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 #include -#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