Re: [PATCH v7 1/7] usb: move the OTG state from the USB PHY to the OTG structure

Felipe Balbi
2014-10-30T16:35:45Z

[-- Attachment #1: Type: text/plain, Size: 2667 bytes --]

On Thu, Oct 30, 2014 at 11:31:48AM -0500, Felipe Balbi wrote:
> On Tue, Oct 28, 2014 at 05:35:35PM +0100, Antoine Tenart wrote:
> > Before using the PHY framework instead of the USB PHY one, we need to
> > move the OTG state into another place, since it won't be available when
> > USB PHY isn't used. This patch moves the OTG state into the OTG
> > structure, and makes all the needed modifications in the drivers
> > using the OTG state.
> >
> > Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
> > Acked-by: Peter Chen <peter.chen@freescale.com>
>
> Acked-by: Felipe Balbi <balbi@ti.com>

fails to apply:

$ patch -p1 --dry-run < patch.diff
checking file drivers/phy/phy-omap-usb2.c
checking file drivers/usb/chipidea/debug.c
checking file drivers/usb/chipidea/otg_fsm.c
checking file drivers/usb/common/usb-otg-fsm.c
checking file drivers/usb/host/ohci-omap.c
checking file drivers/usb/musb/am35x.c
checking file drivers/usb/musb/blackfin.c
checking file drivers/usb/musb/da8xx.c
checking file drivers/usb/musb/davinci.c
checking file drivers/usb/musb/musb_core.c
checking file drivers/usb/musb/musb_dsps.c
checking file drivers/usb/musb/musb_gadget.c
Hunk #3 succeeded at 1791 (offset -1 lines).
Hunk #4 succeeded at 1857 (offset -3 lines).
Hunk #5 FAILED at 1945.
Hunk #6 succeeded at 1968 (offset -7 lines).
Hunk #7 succeeded at 1982 (offset -7 lines).
Hunk #8 succeeded at 1994 (offset -7 lines).
Hunk #9 succeeded at 2012 (offset -7 lines).
Hunk #10 succeeded at 2043 (offset -7 lines).
Hunk #11 succeeded at 2118 (offset -7 lines).
1 out of 11 hunks FAILED
checking file drivers/usb/musb/musb_host.c
checking file drivers/usb/musb/musb_virthub.c
checking file drivers/usb/musb/omap2430.c
Hunk #6 succeeded at 180 (offset 1 line).
Hunk #7 succeeded at 192 (offset 1 line).
Hunk #8 succeeded at 201 (offset 1 line).
Hunk #9 succeeded at 266 (offset 1 line).
Hunk #10 succeeded at 280 (offset 1 line).
checking file drivers/usb/musb/tusb6010.c
checking file drivers/usb/musb/ux500.c
checking file drivers/usb/phy/phy-ab8500-usb.c
checking file drivers/usb/phy/phy-fsl-usb.c
checking file drivers/usb/phy/phy-generic.c
checking file drivers/usb/phy/phy-gpio-vbus-usb.c
checking file drivers/usb/phy/phy-msm-usb.c
Hunk #13 succeeded at 1769 (offset -6 lines).
checking file drivers/usb/phy/phy-mv-usb.c
Hunk #5 succeeded at 715 (offset -2 lines).
checking file include/linux/usb/otg.h
checking file include/linux/usb/phy.h

Please rebase on my testing/next and I'll take the series. When
rebasing, then add Peter's Tested-by/Acked-by where they're missing.

cheers

--
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]