From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 1 Mar 2012 17:20:28 +0000 (-0800)
Subject: Merge tag 'gadget-for-v3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi... 
X-Git-Tag: MMI-PSA29.97-13-9~17266^2~22^2~39
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f9b0f5170918695891f42645737682ccb452ee13;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'gadget-for-v3.4' of git://git./linux/kernel/git/balbi/usb into usb-next

USB: Gadget: changes for 3.4

This merge is rather big. Here's what it contains:

For am5536udc we have just simple coding style fixes. Nothing that has any
potential to cause any issues going forward.

With mv_udc, there's only one single change removing an unneeded NULL check.

at91_udc also only saw a single change this merge window, and that's only
removing a duplicated header.

The Renesas controller has a few more involved changes. Support for SUDMAC was
added, there's now a special handling of IRQ resources for when the IRQ line is
shared between Renesas controller and SUDMAC, we also had a bug fix where
Renesas controller would sleep in atomic context while doing DMA transfers from
a tasklet. There were also a set of minor cleanups.

The FSL UDC also had a scheduling in atomic context bug fix, but that's all.

Thanks to Sebastian, the dummy_hcd now works better than ever with support for
scatterlists and streams. Sebastian also added SuperSpeed descriptors to the
serial gadgets.

The highlight on this merge is the addition of a generic API for mapping and
unmapping usb_requests. This will avoid code duplication on all UDC controllers
and also kills all the defines for DMA_ADDR_INVALID which UDC controllers
sprinkled around. A few of the UDC controllers were already converted to use
this new API.

Conflicts:
	drivers/usb/dwc3/gadget.c
---

f9b0f5170918695891f42645737682ccb452ee13