Hi Greg, here are the gadget changes for v3.6 merge window. There are no conflicts expected with this one either and, while this pull request is rather large, all patches have been pending for quite some time. The following changes since commit f8f5701bdaf9134b1f90e5044a82c66324d2073f: Linux 3.5-rc1 (2012-06-02 18:29:26 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/gadget-for-v3.6 for you to fetch changes up to 65c84ea18b1b4b8c03fb67c3bea023ed1446bd2e: usb: gadget: at91_udc: Propagate devicetree to gadget drivers (2012-07-02 10:38:07 +0300) ---------------------------------------------------------------- usb: gadget: patches for v3.6 merge window This is quite a big pull request and contains patches all over the place. omap_udc is now a bit cleaner after removing omap2 support, fixing some checkpatch.pl warnings and errors, switching over to generic map/unmap routines and preventing a NULL pointer de-reference. s3c-hsotg has been switched over to devm_* API, got some locking fixes and improvements and it also got an implementation for the pullup() method. the mass storage gadgets changed default value of the removable parameter, dropped some unused options and made "file" and "ro" module_parameters read-only in some cases. ffs function got support for HID descriptor. Some UDCs have been converted to clk_prepare_enable() and clk_disable_unprepare(). Marvell now got support for its USB3 controller in mainline after introducing its mv_u3d_core.c driver. ---------------------------------------------------------------- Alexandre Pereira da Silva (5): usb: gadget: lpc32xx_udc: move clock init to clock framework usb: gadget: lpc32xx_udc: Propagate devicetree to gadget drivers usb: gadget: s3c-hsotg: Propagate devicetree to gadget drivers usb: gadget: fsl_udc: Propagate devicetree to gadget drivers usb: gadget: at91_udc: Propagate devicetree to gadget drivers Bhupesh Sharma (3): usb: gadget: uvc: Fix string descriptor STALL issue when multiple uvc functions are added to a configuration usb: gadget: uvc: Use macro for interrupt endpoint status size instead of using a MAGIC number usb: gadget: uvc: Add super-speed support to UVC webcam gadget Daniel Mack (1): usb: gadget: hidg: register OUT INT endpoint for SET_REPORT Fabio Estevam (4): usb: fsl_mxc_udc.c : Use clk_prepare_enable/clk_disable_unprepare usb: imx_udc.c: Use clk_prepare_enable/clk_disable_unprepare usb: imx21-hcd.c: Use clk_prepare_enable/clk_disable_unprepare usb: gadget: fsl_mxc_udc: do not depend on grouped clocks Felipe Balbi (7): usb: gadget: omap_udc: make checkpatch.pl happy usb: gadget: omap_udc: remove useless print usb: gadget: omap_udc: let it work as a module usb: gadget: omap_udc: remove possiblity of NULL pointer de-reference usb: gadget: omap_udc: kfree(NULL) is safe usb: gadget: omap_udc: use generic map/unmap routines usb: gadget: composite: fix ep->maxburst initialization Joe Perches (1): usb: gadget: pch_udc: Fix likely misuse of | for & Kevin Cernekee (1): usb: gadget: Fix g_ether interface link status Koen Beel (1): usb: gadget: ffs: add HID descriptor support. Kuninori Morimoto (1): usb: renesas_usbhs: add DMAEngine ID specification note Lukasz Majewski (4): usb: hsotg: samsung: Replace endpoint specific locks with a global lock usb: hsotg: samsung: Protect the udc_stop routine with spinlock usb: hsotg: samsung: smp Provide *_lock functions abstraction layer for SMP SoCs usb: gadget: hsotg: pullup method implementation for s3c-hsotg UDC driver Michal Nazarewicz (6): usb: gadget: f_mass_storage: change default value of the removable parameter usb: gadget: mass_storage: remove unused options usb: gadget: mass_storage: add documentation usb: gadget: storage_common: remove FSG_BUFFHD_STATIC_BUFFER support usb: gadget: mass_storage: fail fsg_store_file() early if colud not open file usb: gadget: mass_storage: make "file" and "ro" read only in some cases Sachin Kamat (1): usb: s3c-hsotg: Use devm_* functions in s3c-hsotg.c file Steve Bennett (1): usb: gadget: acm_ms: need to set max_speed Tony Lindgren (1): usb: gadget: omap_udc: Remove omap2 support Yu Xu (1): usb: gadget: mv: Add USB 3.0 device driver for Marvell PXA2128 chip. Documentation/usb/mass-storage.txt | 226 ++++ drivers/usb/dwc3/gadget.c | 2 +- drivers/usb/gadget/Kconfig | 9 + drivers/usb/gadget/Makefile | 1 + drivers/usb/gadget/acm_ms.c | 1 + drivers/usb/gadget/at91_udc.c | 1 + drivers/usb/gadget/composite.c | 7 +- drivers/usb/gadget/f_fs.c | 7 + drivers/usb/gadget/f_hid.c | 208 +++- drivers/usb/gadget/f_mass_storage.c | 133 +-- drivers/usb/gadget/f_uvc.c | 287 ++++- drivers/usb/gadget/f_uvc.h | 8 +- drivers/usb/gadget/fsl_mxc_udc.c | 74 +- drivers/usb/gadget/fsl_udc_core.c | 1 + drivers/usb/gadget/imx_udc.c | 6 +- drivers/usb/gadget/lpc32xx_udc.c | 85 +- drivers/usb/gadget/mv_u3d.h | 320 ++++++ drivers/usb/gadget/mv_u3d_core.c | 2098 +++++++++++++++++++++++++++++++++++ drivers/usb/gadget/omap_udc.c | 403 +++---- drivers/usb/gadget/pch_udc.c | 2 +- drivers/usb/gadget/s3c-hsotg.c | 215 ++-- drivers/usb/gadget/storage_common.c | 63 +- drivers/usb/gadget/u_ether.c | 12 +- drivers/usb/gadget/uvc.h | 4 +- drivers/usb/gadget/webcam.c | 29 +- drivers/usb/host/imx21-hcd.c | 6 +- include/linux/usb/renesas_usbhs.h | 8 + 27 files changed, 3521 insertions(+), 695 deletions(-) create mode 100644 Documentation/usb/mass-storage.txt create mode 100644 drivers/usb/gadget/mv_u3d.h create mode 100644 drivers/usb/gadget/mv_u3d_core.c -- balbi
Attachment:
signature.asc
Description: Digital signature