From patchwork Sat May 22 23:53:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 101691 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4MNqwEf029884 for ; Sat, 22 May 2010 23:52:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755477Ab0EVXwy (ORCPT ); Sat, 22 May 2010 19:52:54 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:51583 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755465Ab0EVXwx (ORCPT ); Sat, 22 May 2010 19:52:53 -0400 Received: by fxm5 with SMTP id 5so1685118fxm.19 for ; Sat, 22 May 2010 16:52:52 -0700 (PDT) Received: by 10.223.33.218 with SMTP id i26mr3090516fad.58.1274572371971; Sat, 22 May 2010 16:52:51 -0700 (PDT) Received: from localhost (a91-154-124-12.elisa-laajakaista.fi [91.154.124.12]) by mx.google.com with ESMTPS id 2sm11751366fav.13.2010.05.22.16.52.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 22 May 2010 16:52:48 -0700 (PDT) Date: Sun, 23 May 2010 02:53:10 +0300 From: Amit Kucheria To: Kevin Hilman Cc: me@felipebalbi.com, felipe.balbi@nokia.com, "Gupta, Ajay Kumar" , linux-omap@vger.kernel.org, tony@atomide.com Subject: Re: usb_nop_xceiv_register() missing when OTG built as modules Message-ID: <20100522235310.GA15859@matterhorn.lan> Mail-Followup-To: Kevin Hilman , me@felipebalbi.com, felipe.balbi@nokia.com, "Gupta, Ajay Kumar" , linux-omap@vger.kernel.org, tony@atomide.com References: <87635d54nn.fsf@deeprootsystems.com> <19F8576C6E063C45BE387C64729E7394044DB7B6BD@dbde02.ent.ti.com> <87eik03scn.fsf@deeprootsystems.com> <20100305090426.GG12757@nokia.com> <871vfy3azr.fsf@deeprootsystems.com> <558f5bffd42210a777154737d6730232@secure211.sgcpanel.com> <87y6i6zatj.fsf@deeprootsystems.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <87y6i6zatj.fsf@deeprootsystems.com> X-URL: http://www.verdurent.com/ User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 22 May 2010 23:52:58 +0000 (UTC) From 3df714f995b0895e905090760482194233f66a1d Mon Sep 17 00:00:00 2001 Message-Id: <3df714f995b0895e905090760482194233f66a1d.1274570700.git.amit.kucheria@canonical.com> From: Amit Kucheria Date: Sun, 23 May 2010 01:35:00 +0300 Subject: [PATCH] omap: remove calls to usb_nop_xceiv_register from board files This will allow the OMAP USB drivers to be compiled in as modules. At the moment, CONFIG_NOP_USB_XCEIV cannot be a module. Signed-off-by: Amit Kucheria --- arch/arm/mach-omap2/board-4430sdp.c | 10 ++++++++-- arch/arm/mach-omap2/board-omap3evm.c | 11 ++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index e4a5d66..131f0fd 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -110,8 +110,16 @@ static struct platform_device sdp4430_lcd_device = { .id = -1, }; +static struct platform_device sdp4430_nop_usb_device = { + .name = "nop_usb_xceiv", + .id = -1, + .resource = NULL, + .num_resources = 0, +}; + static struct platform_device *sdp4430_devices[] __initdata = { &sdp4430_lcd_device, + &sdp4430_nop_usb_device, }; static struct omap_lcd_config sdp4430_lcd_config __initdata = { @@ -374,8 +382,6 @@ static void __init omap_4430sdp_init(void) platform_add_devices(sdp4430_devices, ARRAY_SIZE(sdp4430_devices)); omap_serial_init(); omap4_twl6030_hsmmc_init(mmc); - /* OMAP4 SDP uses internal transceiver so register nop transceiver */ - usb_nop_xceiv_register(); /* FIXME: allow multi-omap to boot until musb is updated for omap4 */ if (!cpu_is_omap44xx()) usb_musb_init(&musb_board_data); diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index 81bba19..456e218 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -620,6 +620,13 @@ struct spi_board_info omap3evm_spi_board_info[] = { }, }; +static struct platform_device omap3_evm_nop_usb_device = { + .name = "nop_usb_xceiv", + .id = -1, + .resource = NULL, + .num_resources = 0, +}; + static struct omap_board_config_kernel omap3_evm_config[] __initdata = { }; @@ -634,6 +641,7 @@ static void __init omap3_evm_init_irq(void) static struct platform_device *omap3_evm_devices[] __initdata = { &omap3_evm_dss_device, + &omap3_evm_nop_usb_device, }; static struct ehci_hcd_omap_platform_data ehci_pdata __initdata = { @@ -682,9 +690,6 @@ static void __init omap3_evm_init(void) omap_serial_init(); - /* OMAP3EVM uses ISP1504 phy and so register nop transceiver */ - usb_nop_xceiv_register(); - if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) { /* enable EHCI VBUS using GPIO22 */ omap_mux_init_gpio(22, OMAP_PIN_INPUT_PULLUP); -- 1.7.0.4