Hi Greg,
here are changes for dwc3. Please merge on your usb-next branch.
There will be a conflict with the gadget pull request, because of a
patch from Ido which removes dep->desc and a patch from Paul which adds
another dep->desc access. After fixing the conflict (which should be
very simple) you still need to apply this:
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 1284439..2026dc7 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -1018,7 +1018,7 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
int start_trans = 1;
u8 trans_idx = dep->res_trans_idx;
- if (usb_endpoint_xfer_isoc(dep->desc) &&
+ if (usb_endpoint_xfer_isoc(dep->endpoint.desc) &&
(dep->flags & DWC3_EP_BUSY)) {
start_trans = 0;
WARN_ON_ONCE(!trans_idx);
I'm sorry, but I didn't find a better way to fix it other than merging
gadget and dwc3 myself :-(
Hope it's not a big problem. I apologize for the extra work.
The following changes since commit 0034102808e0dbbf3a2394b82b1bb40b5778de9e:
Linux 3.4-rc2 (2012-04-07 18:30:41 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/dwc3-for-v3.5
for you to fetch changes up to 3ef35fafdc87b72851f7785dc5331a0f4eb1b3ce:
usb: dwc3: define DWC3_EP0_BOUNCE_SIZE (2012-05-04 12:58:14 +0300)
----------------------------------------------------------------
usb: dwc3: patches for v3.5 merge window
This pull request contains one workaround for a Silicon
Issue found on all RTL releases prior to 2.20a, which
would cause a metastability state on Run/Stop bit.
We also have some patches implementing a few extra Standard
requests introduced by USB3 spec (Set SEL and Set Isoch Delay),
as well as one patch, which has been pending for a long time,
implementing LPM support.
Last, but not least, we are splitting the host address space
out of the dwc3 core driver otherwise xHCI won't be able to
request_mem_region() its own address space. This patch is
only needed because we are (as we should) re-using the xHCI
driver, which is a completely separate module.
Together with these three big changes, come a few extra preparatory
patches which most move code around, define macros and so on, as
well as a fix for Isochronous transfers which hasn't been triggered
before.
----------------------------------------------------------------
Felipe Balbi (8):
usb: dwc3: core: define more revision macros
usb: dwc3: workaround: metastability state on Run/Stop bit
usb: ch9: define Set SEL and Set Isoch Delay macros
usb: dwc3: gadget: implement Global Command support
usb: dwc3: ep0: implement Set SEL support
usb: dwc3: gadget: increase setup buffer size
usb: dwc3: ep0: implement support for Set Isoch Delay request
usb: dwc3: define DWC3_EP0_BOUNCE_SIZE
Ido Shayevitz (2):
usb: dwc3: omap: add dwc3_omap_readl/writel functions
usb: dwc3: core: split host address space
Paul Zimmerman (1):
usb: dwc3: gadget: issue Update Transfer command after queuing isoc request
Sebastian Andrzej Siewior (1):
usb: dwc3: ep0: add LPM handling
drivers/usb/dwc3/core.c | 31 +++++----
drivers/usb/dwc3/core.h | 39 +++++++++--
drivers/usb/dwc3/dwc3-omap.c | 32 ++++++---
drivers/usb/dwc3/ep0.c | 155 +++++++++++++++++++++++++++++++++++++++---
drivers/usb/dwc3/gadget.c | 114 ++++++++++++++++++++++++-------
drivers/usb/dwc3/gadget.h | 1 +
drivers/usb/dwc3/host.c | 19 +-----
drivers/usb/dwc3/io.h | 16 ++++-
include/linux/usb/ch9.h | 2 +
9 files changed, 325 insertions(+), 84 deletions(-)
--
balbi
Attachment:
signature.asc
Description: Digital signature
