Am Dienstag, den 30.10.2012, 06:53 -0700 schrieb Simon Glass:
Hi Lucas,
On Tue, Oct 30, 2012 at 6:38 AM, Lucas Stach dev@lynxeye.de wrote:
Am Dienstag, den 30.10.2012, 06:33 -0700 schrieb Simon Glass:
Hi Lucas,
On Tue, Oct 30, 2012 at 2:22 AM, Lucas Stach dev@lynxeye.de wrote:
This moves the Tegra USB implementation into the drivers/usb/host directory.
Signed-off-by: Lucas Stach dev@lynxeye.de
arch/arm/cpu/armv7/tegra20/Makefile | 2 - .../tegra20/usb.c => drivers/usb/host/ehci-tegra.c | 60 ++++++++++++++++++++-- 2 Dateien geändert, 55 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) rename arch/arm/cpu/armv7/tegra20/usb.c => drivers/usb/host/ehci-tegra.c (92%)
For me this patch did not apply:
Applying: tegra: usb: move implementation into right directory error: drivers/usb/host/ehci-tegra.c: already exists in index Patch failed at 0007 tegra: usb: move implementation into right directory When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort".
I tried master and tegra/master.
The series based on u-boot-usb/master, as it's supposed to go in through this tree.
OK thanks, I assumed that because tegra: was the first tag it would go through tegra.
But it doesn't seem to help:
git remote -v |grep upstream-usb upstream-usb http://git.denx.de/u-boot-usb.git (fetch) upstream-usb http://git.denx.de/u-boot-usb.git (push) git fetch upstream-usb
- [new branch] at91sam9x35-ek -> upstream-usb/at91sam9x35-ek
- 5b2e031...0b92a45 cdc-at91 -> upstream-usb/cdc-at91 (forced update)
- 6722fd5...76454b2 master -> upstream-usb/master (forced update)
- [new branch] merge_pending -> upstream-usb/merge_pending
- 2c8b43b...01afc4f next -> upstream-usb/next (forced update)
- [new branch] uboot -> upstream-usb/uboot
(try-usb=5cf309: include/ lq out/ tools/ x/) ~/u> co -b try-usb2 upstream-usb/master Branch try-usb2 set up to track remote branch master from upstream-usb. Switched to a new branch 'try-usb2' (try-usb2=76454b: include/ lq out/ tools/ x/) ~/u> git am ~/Downloads/bundle-3480.mbox Applying: tegra: usb: convert USB_PORTS_MAX to be a define Applying: tegra: usb: make controller init functions more self contained Applying: tegra: usb: fold initial pll setup into board_usb_init Applying: tegra: usb: remove unneeded function parameter Applying: tegra: usb: move controller init into start_port Applying: tegra: usb: various small cleanups Applying: tegra: usb: move implementation into right directory error: drivers/usb/host/ehci-tegra.c: already exists in index Patch failed at 0007 tegra: usb: move implementation into right directory When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort".
Where was the patch that removed drivers/usb/host/ehci-tegra.c?
Hm I'm no expert here, but I didn't actually remove the file. I just copied over the contents of the old implementation file and both git commit and git format-patch recognized this as a rename. Also the cherry-pick from my devel to the usb branch worked flawlessly. If git am can't cope with the rename to an already existing file I may post the patch with the rename forcibly removed, but this will yield a much bigger patch. I'll investigate this.
Thanks for the heads up.
Regards, Lucas