From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [PATCH v2] omap2: ehci: Make Overo compile again Date: Tue, 22 Sep 2009 10:15:27 -0700 Message-ID: <20090922171527.GG14890@atomide.com> References: <20090922150414.GA8975@lixom.net> <20090922161559.GA9767@lixom.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:56335 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750978AbZIVRPe (ORCPT ); Tue, 22 Sep 2009 13:15:34 -0400 Content-Disposition: inline In-Reply-To: <20090922161559.GA9767@lixom.net> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Olof Johansson Cc: linux-omap@vger.kernel.org, Ajay Kumar Gupta , sakoman@gmail.com * Olof Johansson [090922 09:00]: > 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 Sakoman, does this look OK to you? Tony > > --- > > 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)