From patchwork Fri Jan 29 11:36:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maulik Mankad X-Patchwork-Id: 75743 X-Patchwork-Delegate: me@felipebalbi.com 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 o0TBaUWP019630 for ; Fri, 29 Jan 2010 11:36:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756767Ab0A2LgY (ORCPT ); Fri, 29 Jan 2010 06:36:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756739Ab0A2LgX (ORCPT ); Fri, 29 Jan 2010 06:36:23 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:48363 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756720Ab0A2LgW (ORCPT ); Fri, 29 Jan 2010 06:36:22 -0500 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o0TBaDHF007237 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 29 Jan 2010 05:36:15 -0600 Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o0TBaCeK001676; Fri, 29 Jan 2010 17:06:12 +0530 (IST) Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by linfarm476.india.ti.com (8.12.11/8.12.11) with ESMTP id o0TBaC42016896; Fri, 29 Jan 2010 17:06:12 +0530 Received: (from x0082077@localhost) by linfarm476.india.ti.com (8.12.11/8.12.11/Submit) id o0TBaCxD016894; Fri, 29 Jan 2010 17:06:12 +0530 From: Maulik Mankad To: linux-omap@vger.kernel.org Cc: linux-usb@vger.kernel.org, Maulik Mankad , Tony Lindgren , Felipe Balbi , Greg Kroah-Hartman , Olof Johansson Subject: [PATCH v4 2/2] ARM : OMAP : Remove #ifdef from board-omap3evm.c Date: Fri, 29 Jan 2010 17:06:12 +0530 Message-Id: <1264764972-16847-1-git-send-email-x0082077@ti.com> X-Mailer: git-send-email 1.5.5 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]); Fri, 29 Jan 2010 11:36:30 +0000 (UTC) Index: felipe_musb/arch/arm/mach-omap2/board-omap3evm.c =================================================================== --- felipe_musb.orig/arch/arm/mach-omap2/board-omap3evm.c +++ felipe_musb/arch/arm/mach-omap2/board-omap3evm.c @@ -444,10 +444,10 @@ static void __init omap3_evm_init(void) ARRAY_SIZE(omap3evm_spi_board_info)); omap_serial_init(); -#ifdef CONFIG_NOP_USB_XCEIV + /* OMAP3EVM uses ISP1504 phy and so register nop transceiver */ usb_nop_xceiv_register(); -#endif + if (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) { /* enable EHCI VBUS using GPIO22 */ omap_mux_init_gpio(22, OMAP_PIN_INPUT_PULLUP);