Hi, On Fri, Oct 19, 2012 at 11:36:19AM +0300, Felipe Balbi wrote: > Hi Venu, > > > NVIDIA produces several Tegra SoCs viz Tegra20, Tegra30 etc. > > In order to support USB PHY drivers on these SoCs, existing > > PHY driver is split into SoC agnostic common USB PHY driver > > and Tegra20-specific USB phy driver. This will facilitate > > easy addition and deletion of phy drivers for Tegra SoCs. > > > > Signed-off-by: Venu Byravarasu <vbyravarasu@xxxxxxxxxx> > > unfortunately this patch doesn't apply cleanly to my xceiv branch: > > $ patch -p1 --dry-run < apply.diff > patching file drivers/usb/host/ehci-tegra.c > patching file drivers/usb/phy/Makefile > patching file drivers/usb/phy/tegra_usb_phy.c > Hunk #2 succeeded at 35 with fuzz 2 (offset 2 lines). > Hunk #3 succeeded at 67 (offset 2 lines). > Hunk #4 succeeded at 94 (offset 2 lines). > Hunk #5 succeeded at 124 (offset 2 lines). > Hunk #6 succeeded at 134 (offset 2 lines). > Hunk #7 succeeded at 161 (offset 2 lines). > Hunk #8 succeeded at 189 (offset 2 lines). > Hunk #9 succeeded at 247 (offset 2 lines). > Hunk #10 succeeded at 304 (offset 2 lines). > Hunk #11 succeeded at 315 (offset 2 lines). > Hunk #12 succeeded at 347 (offset 2 lines). > Hunk #13 succeeded at 360 (offset 2 lines). > Hunk #14 succeeded at 370 (offset 2 lines). > Hunk #15 succeeded at 391 (offset 2 lines). > Hunk #16 succeeded at 402 (offset 2 lines). > Hunk #17 succeeded at 471 (offset 2 lines). > Hunk #18 succeeded at 488 (offset 2 lines). > patching file drivers/usb/phy/tegra2_usb_phy.h > patching file drivers/usb/phy/tegra_usb_phy.c > Hunk #1 FAILED at 30. > Hunk #2 succeeded at 208 (offset 2 lines). > Hunk #3 succeeded at 224 (offset 2 lines). > Hunk #4 succeeded at 271 (offset 2 lines). > Hunk #5 succeeded at 285 (offset 2 lines). > Hunk #6 succeeded at 300 (offset 2 lines). > 1 out of 6 hunks FAILED -- saving rejects to file drivers/usb/phy/tegra_usb_phy.c.rej > patching file include/linux/usb/tegra_usb_phy.h > > Also, I need Alan's ack because you're changing ehci-tegra.c now replying to correct thread. sorry -- balbi
Attachment:
signature.asc
Description: Digital signature