From patchwork Tue Sep 22 16:15:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 49344 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 n8MG0BPc014269 for ; Tue, 22 Sep 2009 16:00:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756538AbZIVQAG (ORCPT ); Tue, 22 Sep 2009 12:00:06 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756536AbZIVQAF (ORCPT ); Tue, 22 Sep 2009 12:00:05 -0400 Received: from lixom.net ([66.141.50.11]:59826 "EHLO mail.lixom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756457AbZIVQAE (ORCPT ); Tue, 22 Sep 2009 12:00:04 -0400 Received: by mail.lixom.net (Postfix, from userid 999) id 41D72B795F; Tue, 22 Sep 2009 11:15:59 -0500 (CDT) Date: Tue, 22 Sep 2009 11:15:59 -0500 From: Olof Johansson To: linux-omap@vger.kernel.org Cc: Ajay Kumar Gupta , tony@atomide.com, sakoman@gmail.com Subject: [PATCH v2] omap2: ehci: Make Overo compile again Message-ID: <20090922161559.GA9767@lixom.net> References: <20090922150414.GA8975@lixom.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090922150414.GA8975@lixom.net> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Overo needs the same changes as the other platforms do for the ehci changes. Also, roll in the corresponding change from Steve Sakoman fixing the port setup (removing the redundant GPIO setup and switching to port 2). Signed-off-by: Olof Johansson Acked-by: Steve Sakoman --- -- 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/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 17f2318..75bdc09 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c @@ -384,6 +384,19 @@ static struct platform_device *overo_devices[] __initdata = { &overo_lcd_device, }; +static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { + .port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN, + .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY, + .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN, + + .chargepump = false, + .phy_reset = true, + .reset_gpio_port[0] = -EINVAL, + .reset_gpio_port[1] = OVERO_GPIO_USBH_NRESET, + .reset_gpio_port[2] = -EINVAL +}; + + static void __init overo_init(void) { overo_i2c_init(); @@ -391,7 +404,7 @@ static void __init overo_init(void) omap_serial_init(); overo_flash_init(); usb_musb_init(); - usb_ehci_init(EHCI_HCD_OMAP_MODE_PHY, false, true, 183, -EINVAL); + usb_ehci_init(&ehci_pdata); overo_ads7846_init(); overo_init_smsc911x(); @@ -434,14 +447,6 @@ static void __init overo_init(void) else printk(KERN_ERR "could not obtain gpio for " "OVERO_GPIO_USBH_CPEN\n"); - - if ((gpio_request(OVERO_GPIO_USBH_NRESET, - "OVERO_GPIO_USBH_NRESET") == 0) && - (gpio_direction_output(OVERO_GPIO_USBH_NRESET, 1) == 0)) - gpio_export(OVERO_GPIO_USBH_NRESET, 0); - else - printk(KERN_ERR "could not obtain gpio for " - "OVERO_GPIO_USBH_NRESET\n"); } static void __init overo_map_io(void)