Hi Greg, Here's the meat for this merge window. A bunch of fixes on UDC controllers, a new generic API for mapping/unmapping usb_requests, new descriptors and so on. All commits have been on linux-usb for quite a while. Please consider pulling on your usb-next branch. The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f: Linux 3.3-rc1 (2012-01-19 15:04:48 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/gadget-for-v3.4 for you to fetch changes up to 6440093f5eae9842feb06e40d41c3bd569b6b461: usb: gadget: goku: use generic map/unmap routines (2012-02-28 14:49:12 +0200) ---------------------------------------------------------------- Multiple bugfixes on several different UDC drivers Introduction of a new USB Audio Class 2 function driver Introduction of generic usb_request map/unmap routines Introduction of Association Descriptor to the ECM function ---------------------------------------------------------------- Cyril Roelandt (6): usb: amd5536udc: Fix brace coding style issues. usb: amd5536udc: Fix coding style issues. usb: amd5536udc: Fix indentation usb: amd5536udc: use the DEFINE_PCI_DEVICE_TABLE macro usb: amd5536udc: Fix the type of ep_string usb: amd5536udc: Remove old CVS markers Dan Carpenter (1): usb: gadget: mv_udc: remove unneeded NULL check Danny Kukawka (1): usb: at91_udc: linux/prefetch.h included twice Felipe Balbi (9): usb: gadget: add generic map/unmap request utilities usb: dwc3: gadget: use generic map/unmap routines usb: gadget: langwell: use generic map/unmap functions usb: renesas: gadget: use generic map/unmap routines usb: gadget: amd5536: use generic map/unmap routines usb: gadget: r8a66597: use generic map/unmap routines usb: gadget: net2272: use generic map/umap routines usb: gadget: net2280: use generic map/unmap routines usb: gadget: goku: use generic map/unmap routines Guennadi Liakhovetski (2): usb: renesas_usbhs: (cosmetic) simplify list operations usb: renesas: fix scheduling in atomic context bug Heiko Stübner (2): usb: s3c-hsudc: Use helper functions instead of generic container_of usb: s3c-hsudc: add basic runtime_pm calls Ido Shayevitz (1): usb: gadget: Clear usb_endpoint_descriptor inside the struct usb_ep on disable Jassi Brar (4): usb: gadget: Rename audio function to uac1 usb: uac2: Add ACHeader and FormatType descriptor usb: gadget: audio: Move string IDs to audio.c usb: gadget: Add Audio Class 2.0 Driver Kuninori Morimoto (1): usb: renesas_usbhs: bugfix: add .release function to gpriv->gadget.dev Michal Nazarewicz (1): usb: gadget: update Michal Nazarewicz's email address Peter Chen (1): usb: fsl_udc_core: Fix scheduling while atomic dump message Praveena Nadahally (1): usb: gadget: Add Interface Association Descriptor to ECM Sebastian Andrzej Siewior (13): usb: gadget: dummy_hcd: initialize max_streams early usb: gadget: dummy_hcd: move the transfer part into its own function usb: gadget: dummy_hcd: add sg support usb: gadget: dummy_hcd: rename dummy_udc_udpate_ep0() to dummy_udc_update_ep0() usb: gadget: dummy_hcd: make alloc/free streams static usb: gadget: dummy_hcd: complete stream support usb: dummy_hcd: use usb_endpoint_type() usb: gadget: dummy_hcd: clean up checkpatch usb: gadget: f_mass_storage: remove one FSG_NO_INTR_EP usb: gadget: dummy_hcd: don't assign ->desc on error case usb: gadget: dummy_hcd: fix null-deref free req usb: gadget: clean the ep in autoconf before returning it. usb: gadget: add usb3.0 descriptors to serial gadgets Shimoda, Yoshihiro (2): usb: renesas_usbhs: add IRQ resource decoding for IRQF_SHARED usb: renesas_usbhs: add support for SUDMAC Tomoya MORINAGA (8): usb: gadget: pch_udc: Fix disconnect issue usb: gadget: pch_udc: Fix wrong return value usb: gadget: pch_udc: Fix USB suspend issue usb: gadget: pch_udc: Fix usb/gadget/pch_udc: Fix ether gadget connect/disconnect issue usb: gadget: pch_udc: Reduce redundant interrupt usb: gadget: pch_udc: Add debug message usb: gadget: pch_udc: Detecting VBUS through GPIO usb: gadget: pch_udc: Detecting VBUS through GPIO with interrupt drivers/usb/dwc3/core.h | 2 - drivers/usb/dwc3/ep0.c | 16 +- drivers/usb/dwc3/gadget.c | 94 +- drivers/usb/dwc3/gadget.h | 2 - drivers/usb/gadget/Kconfig | 25 +- drivers/usb/gadget/amd5536udc.c | 147 +-- drivers/usb/gadget/at91_udc.c | 2 +- drivers/usb/gadget/atmel_usba_udc.c | 1 + drivers/usb/gadget/audio.c | 47 +- drivers/usb/gadget/ci13xxx_udc.c | 1 + drivers/usb/gadget/dummy_hcd.c | 755 +++++++++------ drivers/usb/gadget/epautoconf.c | 16 +- drivers/usb/gadget/f_acm.c | 52 +- drivers/usb/gadget/f_ecm.c | 25 + drivers/usb/gadget/f_fs.c | 2 +- drivers/usb/gadget/f_mass_storage.c | 3 +- drivers/usb/gadget/f_rndis.c | 2 +- drivers/usb/gadget/f_serial.c | 42 + drivers/usb/gadget/{f_audio.c => f_uac1.c} | 25 +- drivers/usb/gadget/f_uac2.c | 1449 ++++++++++++++++++++++++++++ drivers/usb/gadget/fsl_qe_udc.c | 1 + drivers/usb/gadget/fsl_udc_core.c | 19 +- drivers/usb/gadget/g_ffs.c | 2 +- drivers/usb/gadget/goku_udc.c | 19 +- drivers/usb/gadget/langwell_udc.c | 46 +- drivers/usb/gadget/mass_storage.c | 2 +- drivers/usb/gadget/multi.c | 2 +- drivers/usb/gadget/mv_udc_core.c | 4 +- drivers/usb/gadget/net2272.c | 18 +- drivers/usb/gadget/net2280.c | 19 +- drivers/usb/gadget/omap_udc.c | 1 + drivers/usb/gadget/pch_udc.c | 322 ++++++- drivers/usb/gadget/pxa25x_udc.c | 2 + drivers/usb/gadget/r8a66597-udc.c | 10 +- drivers/usb/gadget/s3c-hsudc.c | 21 +- drivers/usb/gadget/s3c2410_udc.c | 2 + drivers/usb/gadget/serial.c | 2 +- drivers/usb/gadget/storage_common.c | 2 +- drivers/usb/gadget/{u_audio.c => u_uac1.c} | 4 +- drivers/usb/gadget/{u_audio.h => u_uac1.h} | 2 +- drivers/usb/gadget/udc-core.c | 52 + drivers/usb/renesas_usbhs/common.c | 11 +- drivers/usb/renesas_usbhs/common.h | 1 + drivers/usb/renesas_usbhs/fifo.c | 29 +- drivers/usb/renesas_usbhs/fifo.h | 3 +- drivers/usb/renesas_usbhs/mod.c | 2 +- drivers/usb/renesas_usbhs/mod_gadget.c | 79 +- include/linux/usb/audio-v2.h | 21 + include/linux/usb/gadget.h | 10 + include/linux/usb/renesas_usbhs.h | 1 + tools/usb/ffs-test.c | 2 +- tools/usb/testusb.c | 2 +- 52 files changed, 2734 insertions(+), 687 deletions(-) rename drivers/usb/gadget/{f_audio.c => f_uac1.c} (97%) create mode 100644 drivers/usb/gadget/f_uac2.c rename drivers/usb/gadget/{u_audio.c => u_uac1.c} (99%) rename drivers/usb/gadget/{u_audio.h => u_uac1.h} (94%) -- balbi
Attachment:
signature.asc
Description: Digital signature