On Thu, Apr 19, 2012 at 11:01:16AM -0400, Alan Stern wrote: > On Thu, 19 Apr 2012, Igor Grinberg wrote: > > > ping > > > > Alan, Felipe, > > Can this go into 3.5? > > It's okay with me. > > Acked-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> Also fine from my side: Acked-by: Felipe Balbi <balbi@xxxxxx> > > The dependency patch has already reached Samuel's tree, > > what would be the best way to apply this one? > > Should I ask Samuel to apply this one also (after having your acks) > > via his tree, to reduce possible merge failures/conflicts? > > Sure, go ahead. > > > On 03/27/12 16:08, Igor Grinberg wrote: > > > When PHY reset pin is connected to a GPIO on external GPIO chip > > > (e.g. I2C), we should not call the gpio_set_value() function, but > > > gpio_set_value_cansleep(). > > > > > > Signed-off-by: Igor Grinberg <grinberg@xxxxxxxxxxxxxx> > > > --- > > > This patch depends on the patch from Keshava [1]: > > > ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue > > > > > > [1] http://www.spinics.net/lists/linux-omap/msg66774.html > > > > > > drivers/usb/host/ehci-omap.c | 4 ++-- > > > 1 files changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c > > > index 5c78f9e..26e9241 100644 > > > --- a/drivers/usb/host/ehci-omap.c > > > +++ b/drivers/usb/host/ehci-omap.c > > > @@ -258,10 +258,10 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev) > > > udelay(10); > > > > > > if (gpio_is_valid(pdata->reset_gpio_port[0])) > > > - gpio_set_value(pdata->reset_gpio_port[0], 1); > > > + gpio_set_value_cansleep(pdata->reset_gpio_port[0], 1); > > > > > > if (gpio_is_valid(pdata->reset_gpio_port[1])) > > > - gpio_set_value(pdata->reset_gpio_port[1], 1); > > > + gpio_set_value_cansleep(pdata->reset_gpio_port[1], 1); > > > } > > > > > > return 0; > -- balbi
Attachment:
signature.asc
Description: Digital signature
