Hi Greg, here's the pull request for USB Gadget and MUSB. I just tested these changes with MUSB and thus far everything seems ok. I had a few last minute issues with MUSB but they are fixed on this pull request. Like noted before on the announcement I made [1] we have one small known regression with MUSB regarding a module parameter which shouldn't really exist. This regression will be patched during the -rc cycle, but will only be properly fixed on the 3.2 merge window because it, again, requires a big re-work of how MUSB works (basically we need to change how FIFO space is allocated and how endpoints are setup). I hope this is all ok for you. Patches are coming as a reply to this mail, for reference. For everybody else, I'm not taking any more patches for 3.1 merge window. Everybody should move to bug fixing mode for the next -rc cycle. If you have any bugfix which should go on this -rc cycle, be sure it won't cause conflicts with this pull request, if it will cause, send me a patch for next -rc cycle and Cc stable@xxxxxxxxxx. [1] http://marc.info/?l=linux-usb&m=130918157323547&w=2 The following changes since commit 664a51a81f6ba39db30cd7b7de61577ca0b2d20d: USB: deprecate g_file_storage (2011-06-15 17:54:46 -0700) are available in the git repository at: master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb.git for-next Felipe Balbi (12): usb: gadget: introduce UDC Class usb: gadget: ci13xx_udc: fix usb_ep_enable() call usb: gadget: chips: remove ifdef trickery usb: gadget: composite: fix compile error on ARM usb: musb: be careful when using different fifo_modes usb: musb: drop a gigantic amount of ifdeferry usb: gadget: allow multiple gadgets to be built usb: musb: omap: always create musb device usb: musb: no need to access platform_device usb: musb: allow new style bind to work usb: musb: hold a driver pointer Merge branches 'musb' and 'gadget' into for-next Mike Frysinger (1): usb: musb: update musb_platform_ops docs to match code Sebastian Andrzej Siewior (18): usb: gadget: convert all users to the new udc infrastructure usb: gadget: net2272: cleanup pci_register_driver() error path usb: gadget: add platform module alias where it is missing usb: gadget: s3c2410_udc: use platform ids instead usb: gadget: dummy_hcd: use dummy_pullup() instead of open coding usb: gadget: dummy_hcd: set gadget.is_otg before calling bind() usb: gadget: dummy_hcd: use gadget_to_dummy_hcd() where possible usb: gadget: dummy_hcd: use less checks for USB_SPEED_SUPER usb: gadget: remove net2280_set_fifo_mode() usb: gadget: dummy_hcd: move common bits of suspend/resume into one function usb: gadget: defer setting maxpacket till ->setup() usb: gadget: dummy_hcd: move ep initialisation HW setup usb: gadget: dummy_hcd: init is_otg in init_dummy_udc_hw() usb: gadget: dummy_hcd: move selection of speed into ->pullup() usb: gadget: udc-core: add "new-style" registration interface usb: musb: convert musb to new style bind usb: gadget: dummy_hcd: convert to new-style udc-probe usb: gadget: udc-core: wire up sysfs files Sergei Shtylyov (1): usb: gadget: add missing #include's Tatyana Brokhman (10): usb: gadget: add usb_endpoint_descriptor to struct usb_ep usb: gadget: configure endpoint according to gadget speed usb: gadget: use config_ep_by_speed() instead of ep_choose() usb: gadget: add max_speed to usb_composite_driver usb: gadget: coding style fix usb: gadget: add streams support to the gadget framework usb: gadget: add SuperSpeed support to the Gadget Framework usb: gadget: dummy_hcd: use the shared_hcd infrastructure usb: gadget: dummy_hcd: add SuperSpeed support usb: gadget: dummy_hcd: add 'is_high_speed' parameter arch/arm/mach-omap2/usb-musb.c | 10 - drivers/usb/Kconfig | 2 - drivers/usb/gadget/Kconfig | 292 ++------ drivers/usb/gadget/Makefile | 1 + drivers/usb/gadget/amd5536udc.c | 18 +- drivers/usb/gadget/at91_udc.c | 20 +- drivers/usb/gadget/atmel_usba_udc.c | 26 +- drivers/usb/gadget/audio.c | 5 + drivers/usb/gadget/cdc2.c | 5 + drivers/usb/gadget/ci13xxx_msm.c | 1 + drivers/usb/gadget/ci13xxx_udc.c | 50 +- drivers/usb/gadget/composite.c | 363 ++++++++++- drivers/usb/gadget/config.c | 25 - drivers/usb/gadget/dbgp.c | 10 +- drivers/usb/gadget/dummy_hcd.c | 1160 ++++++++++++++++++++++---------- drivers/usb/gadget/epautoconf.c | 132 +++- drivers/usb/gadget/ether.c | 5 + drivers/usb/gadget/f_acm.c | 50 +- drivers/usb/gadget/f_audio.c | 5 +- drivers/usb/gadget/f_ecm.c | 54 +- drivers/usb/gadget/f_eem.c | 36 +- drivers/usb/gadget/f_fs.c | 3 +- drivers/usb/gadget/f_hid.c | 22 +- drivers/usb/gadget/f_loopback.c | 17 +- drivers/usb/gadget/f_mass_storage.c | 33 +- drivers/usb/gadget/f_ncm.c | 58 +-- drivers/usb/gadget/f_obex.c | 32 +- drivers/usb/gadget/f_phonet.c | 17 +- drivers/usb/gadget/f_rndis.c | 52 +- drivers/usb/gadget/f_serial.c | 32 +- drivers/usb/gadget/f_sourcesink.c | 14 +- drivers/usb/gadget/f_subset.c | 33 +- drivers/usb/gadget/f_uvc.c | 6 +- drivers/usb/gadget/file_storage.c | 13 +- drivers/usb/gadget/fsl_qe_udc.c | 20 +- drivers/usb/gadget/fsl_udc_core.c | 20 +- drivers/usb/gadget/fusb300_udc.c | 15 +- drivers/usb/gadget/g_ffs.c | 5 + drivers/usb/gadget/gadget_chips.h | 182 +---- drivers/usb/gadget/gmidi.c | 9 +- drivers/usb/gadget/goku_udc.c | 19 +- drivers/usb/gadget/hid.c | 5 + drivers/usb/gadget/imx_udc.c | 20 +- drivers/usb/gadget/inode.c | 11 +- drivers/usb/gadget/langwell_udc.c | 20 +- drivers/usb/gadget/m66592-udc.c | 17 +- drivers/usb/gadget/mass_storage.c | 5 + drivers/usb/gadget/multi.c | 5 + drivers/usb/gadget/mv_udc_core.c | 21 +- drivers/usb/gadget/ncm.c | 5 + drivers/usb/gadget/net2272.c | 54 ++- drivers/usb/gadget/net2280.c | 74 +-- drivers/usb/gadget/nokia.c | 5 + drivers/usb/gadget/omap_udc.c | 22 +- drivers/usb/gadget/pch_udc.c | 16 +- drivers/usb/gadget/printer.c | 40 +- drivers/usb/gadget/pxa25x_udc.c | 19 +- drivers/usb/gadget/pxa27x_udc.c | 23 +- drivers/usb/gadget/r8a66597-udc.c | 16 +- drivers/usb/gadget/s3c-hsotg.c | 19 +- drivers/usb/gadget/s3c-hsudc.c | 17 +- drivers/usb/gadget/s3c2410_udc.c | 58 +- drivers/usb/gadget/serial.c | 5 + drivers/usb/gadget/u_ether.c | 12 +- drivers/usb/gadget/u_ether.h | 4 - drivers/usb/gadget/u_serial.c | 4 +- drivers/usb/gadget/u_serial.h | 2 - drivers/usb/gadget/udc-core.c | 484 +++++++++++++ drivers/usb/gadget/webcam.c | 5 + drivers/usb/gadget/zero.c | 5 + drivers/usb/musb/Kconfig | 75 +-- drivers/usb/musb/Makefile | 4 +- drivers/usb/musb/am35x.c | 4 - drivers/usb/musb/blackfin.h | 2 +- drivers/usb/musb/da8xx.c | 12 +- drivers/usb/musb/davinci.c | 5 - drivers/usb/musb/musb_core.c | 121 +--- drivers/usb/musb/musb_core.h | 70 +-- drivers/usb/musb/musb_gadget.c | 102 +-- drivers/usb/musb/musb_gadget_ep0.c | 4 - drivers/usb/musb/musb_host.h | 4 - drivers/usb/musb/musb_virthub.c | 6 - drivers/usb/musb/omap2430.c | 15 +- drivers/usb/musb/tusb6010.c | 26 +- drivers/usb/renesas_usbhs/Kconfig | 16 - drivers/usb/renesas_usbhs/mod_gadget.c | 20 +- include/linux/usb/composite.h | 32 +- include/linux/usb/gadget.h | 87 ++- 88 files changed, 2643 insertions(+), 1827 deletions(-) create mode 100644 drivers/usb/gadget/udc-core.c delete mode 100644 drivers/usb/renesas_usbhs/Kconfig -- 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
