Hi Greg,
Here are the pending dwc3 patches for 3.3 merge window. All of these
have been tested on our FPGA platform with x86 and ARM.
You will have one very simple merge conflict with your greg/usb-next
branch, here's the resolution:
diff --cc drivers/usb/dwc3/dwc3-omap.c
index 4e27d5b,5809bf4..e1a8c72
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@@ -384,8 -394,9 +394,10 @@@ static struct platform_driver dwc3_omap
},
};
- module_platform_driver(dwc3_omap_driver);
+ MODULE_ALIAS("platform:omap-dwc3");
+
MODULE_AUTHOR("Felipe Balbi <balbi@xxxxxx>");
MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("DesignWare USB3 OMAP Glue Layer");
+
-module_platform_driver(dwc3_omap_driver);
++module_platform_driver(dwc3_omap_driver);
The following changes since commit dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50:
Linux 3.2-rc5 (2011-12-09 15:09:32 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git for-next/dwc3
Felipe Balbi (23):
usb: dwc3: gadget: don't disable endpoints on exit
usb: dwc3: allow forcing a maximum speed
usb: dwc3: calculate number of event buffers dynamically
usb: dwc3: fetch mode of operation from HW
usb: dwc3: add xHCI Host support
usb: dwc3: always compile gadget side too
usb: dwc3: move gadget prototypes to core.h
usb: dwc3: depend on both Host and Gadget stacks
usb: dwc3: ep0: SetAddress() won't be issued while Configured
usb: dwc3: debugfs: add support for changing port mode
usb: dwc3: ep0: handle unexpected XferNotReady events
usb: dwc3: move dwc3 device ID bitmap to core.c
usb: dwc3: omap: add multiple instances support to OMAP
usb: dwc3: core: drop DWC3_EVENT_BUFFERS_MAX
usb: dwc3: fix few coding style problems
usb: dwc3: fix sparse errors
usb: dwc3: workaround: U1/U2 -> U0 transiton
usb: dwc3: workaround: missing USB3 Reset event
usb: dwc3: workaround: missing disconnect event
usb: dwc3: omap: move to module_platform_driver
usb: dwc3: ep0: fix GetStatus handling (again)
usb: dwc3: gadget: fix stream enable bit
usb: dwc3: ep0: fix for possible early delayed_status
Sebastian Andrzej Siewior (14):
usb: dwc3: add a platform device alias
usb: dwc3: debugfs: hold the lock in during mode change
usb: dwc3: host: remove unused includes
usb: dwc3: reset pending status flag in error case
usb: dwc3: remove special status request handling in ep0
usb: dwc3: ep0: use proper endianess in SetFeature for wIndex
usb: dwc3: ep0: don't use ep0in for transfers
usb: dwc3: use a helper function for operation mode setting
usb: dwc3: move generic dwc3 code from gadget into core
usb: dwc3: ep0: push ep0state into xfernotready processing
usb: dwc3: ep0: handle delayed_status again
usb: dwc3: gadget: return early in dwc3_cleanup_done_reqs()
usb: dwc3: use correct hwparam register for power mgm check
usb: dwc3: ep0: use dwc3_request for ep0 requsts instead of usb_request
drivers/usb/dwc3/Kconfig | 5 +-
drivers/usb/dwc3/Makefile | 6 +-
drivers/usb/dwc3/core.c | 209 +++++++++++++++++++++++++++++++++++-------
drivers/usb/dwc3/core.h | 62 ++++++++++++-
drivers/usb/dwc3/debugfs.c | 83 ++++++++++++++++-
drivers/usb/dwc3/dwc3-omap.c | 41 ++++----
drivers/usb/dwc3/dwc3-pci.c | 49 ++---------
drivers/usb/dwc3/ep0.c | 160 ++++++++++++++++++++++----------
drivers/usb/dwc3/gadget.c | 197 +++++++++++++++++++++++++++++----------
drivers/usb/dwc3/gadget.h | 29 +------
drivers/usb/dwc3/host.c | 102 ++++++++++++++++++++
drivers/usb/dwc3/io.h | 2 +-
drivers/usb/gadget/Kconfig | 12 ---
13 files changed, 706 insertions(+), 251 deletions(-)
create mode 100644 drivers/usb/dwc3/host.c
--
balbi
Attachment:
signature.asc
Description: Digital signature
