From patchwork Thu Mar 3 08:48:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 605521 X-Patchwork-Delegate: me@felipebalbi.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p238mqcT026210 for ; Thu, 3 Mar 2011 08:48:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757922Ab1CCIsi (ORCPT ); Thu, 3 Mar 2011 03:48:38 -0500 Received: from na3sys009aog114.obsmtp.com ([74.125.149.211]:49558 "EHLO na3sys009aog114.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751651Ab1CCIsh (ORCPT ); Thu, 3 Mar 2011 03:48:37 -0500 Received: from source ([209.85.214.45]) (using TLSv1) by na3sys009aob114.postini.com ([74.125.148.12]) with SMTP ID DSNKTW9V4/laZ9Q+8+dOpZDDfAHAE/vf8YUg@postini.com; Thu, 03 Mar 2011 00:48:36 PST Received: by bwz16 with SMTP id 16so1031710bwz.32 for ; Thu, 03 Mar 2011 00:48:31 -0800 (PST) Received: by 10.204.14.14 with SMTP id e14mr1142661bka.4.1299142111529; Thu, 03 Mar 2011 00:48:31 -0800 (PST) Received: from localhost (cs181221087.pp.htv.fi [82.181.221.87]) by mx.google.com with ESMTPS id b6sm564096bkb.22.2011.03.03.00.48.30 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Mar 2011 00:48:30 -0800 (PST) Date: Thu, 3 Mar 2011 10:48:29 +0200 From: Felipe Balbi To: Stephen Rothwell Cc: Greg KH , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Anand Gadiyar , Felipe Balbi , Tony Lindgren , linux-omap@vger.kernel.org, Keshava Munegowda Subject: Re: linux-next: manual merge of the usb tree with the omap tree Message-ID: <20110303084829.GB2644@legolas.emea.dhcp.ti.com> Reply-To: balbi@ti.com References: <20110302165755.b45124c8.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20110302165755.b45124c8.sfr@canb.auug.org.au> 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 03 Mar 2011 08:48:53 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 1230121..f603f3b 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -44,7 +44,6 @@ #define ETH_KS8851_IRQ 34 #define ETH_KS8851_POWER_ON 48 #define ETH_KS8851_QUART 138 -#define OMAP4SDP_MDM_PWR_EN_GPIO 157 #define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO 184 #define OMAP4_SFH7741_ENABLE_GPIO 188 @@ -251,16 +250,6 @@ static void __init omap_4430sdp_init_irq(void) gic_init_irq(); } -static const struct usbhs_omap_board_data usbhs_bdata __initconst = { - .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, - .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, - .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, - .phy_reset = false, - .reset_gpio_port[0] = -EINVAL, - .reset_gpio_port[1] = -EINVAL, - .reset_gpio_port[2] = -EINVAL, -}; - static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_UTMI, .mode = MUSB_OTG, @@ -577,14 +566,6 @@ static void __init omap_4430sdp_init(void) omap_serial_init(); omap4_twl6030_hsmmc_init(mmc); - /* Power on the ULPI PHY */ - status = gpio_request(OMAP4SDP_MDM_PWR_EN_GPIO, "USBB1 PHY VMDM_3V3"); - if (status) - pr_err("%s: Could not get USBB1 PHY GPIO\n", __func__); - else - gpio_direction_output(OMAP4SDP_MDM_PWR_EN_GPIO, 1); - - usbhs_init(&usbhs_bdata); usb_musb_init(&musb_board_data); status = omap_ethernet_init();