On Mon, 9 Jul 2012, Greg KH wrote: > On Fri, Jun 29, 2012 at 11:42:46AM -0400, Alan Stern wrote: > > This patch (as1564b) converts the EHCI platform drivers to use the > > central ehci_setup() routine for generic controller initialization > > rather than each having its own idiosyncratic approach. > > > > The major point of difficulty lies in ehci-pci's many vendor- and > > device-specific workarounds. Some of them have to be applied before > > calling ehci_setup() and some after, which necessitates a fair amount > > of code motion. The other platform drivers require much smaller > > changes. > > > > One point not addressed by the patch is whether ports should be > > powered on or off following initialization. The different drivers > > appear to handle this pretty much at random. In fact it shouldn't > > matter, because the hub driver turns on power to all ports when it > > binds to the root hub. Straightening that out will be left for > > another day. > > > > Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> > > > > --- > > > > Ver. 2: Rebased on top of Russ Dill's changes to ehci-omap.c. > > Fixed several mistakes involving unused local variables and calls to > > ehci_setup(ehci) rather than ehci_setup(hcd). > > I'm getting a conflict when trying to apply this in that driver: > > patching file drivers/usb/host/ehci-omap.c > Hunk #3 FAILED at 329. > Hunk #4 FAILED at 356. > Hunk #5 succeeded at 560 (offset 14 lines). > 2 out of 5 hunks FAILED -- saving rejects to file drivers/usb/host/ehci-omap.c.rej > > Can you refresh this and resend it? That's because my patch was meant to go on top of Russ Dill's changes: http://marc.info/?l=linux-usb&m=134084901330725&w=2 which evidently hasn't been merged yet. Or if it has, it's in Felipe's tree instead of yours. The two patches touch the same regions of code. What should we do? Alan Stern -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
