Hi Greg,
here's the pull request for the gadget framework.
There's a bunch of details here and there'll be one conflict with your
greg/usb-next branch. I have pushed a branch 'merge-result-for-greg' to
my k.org tree with the solved merge conflict, if you want to take a
look.
Please let me know if there are any issues with the merge.
The following changes since commit d9875690d9b89a866022ff49e3fcea892345ad92:
Linux 3.6-rc2 (2012-08-16 14:51:24 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/gadget-for-v3.7
for you to fetch changes up to 5c4d46eb89fe99011a02048533857345d9e8b506:
usb: gadget serial: don't shift bcd version left by 16 (2012-09-10 20:04:20 +0300)
----------------------------------------------------------------
usb: gadget: patches for v3.7 merge window
This pull request is large but the biggest part is the first part
of the cleanup on the gadget framework so we have a saner setup
to add configfs support for v3.8.
We have also some more conversions to the new udc_start/udc_stop
which makes us closer from dropping the old interfaces.
USB_GADGET_DUALSPEED and USB_GADGET_SUPERSPEED are finally gone,
thanks to Michal for his awesome work.
Other than that, we have the usual set of miscellaneous changes
and cleanups involving improvements to debug messages, removal
of duplicated includes, moving dereference after NULL test,
making renesas_hsbhs' irq handler Shared, unused code being dropped,
prevention of sleep-inside-spinlock bugs and a race condition fix
on udc-core.
----------------------------------------------------------------
Alan Stern (1):
usb: gadget: dummy-hcd: remember to update driver pointer
Andy Shevchenko (2):
usb: gadget: use native print_hex_dump_bytes()
usb: gadget: use %pm to print mac addresses
Chao Xie (1):
usb: gadget: mv_udc: add iso support
Du, Changbin (1):
usb: gadget: s3c-hsotg: fix core reset timeout failure
Fabio Porcedda (1):
usb: gadget: at91_udc: fix dt support
Julia Lawall (1):
usb: gadget: lpc32xx_udc.c: adjust inconsistent IS_ERR and PTR_ERR
Kevin Cernekee (2):
usb: gadget: udc-core: Race between disconnect/unbind and setup
usb: gadget: bcm63xx UDC driver
Michael Grzeschik (1):
usb composite: fix locking in usb_function_activate
Michal Nazarewicz (1):
usb: gadget: get rid of USB_GADGET_{DUAL,SUPER}SPEED
Neil Zhang (5):
usb: gadget: mv_udc: reduce the delay interval
usb: gadget: mv_udc: remove unused code
usb: gadget: mv_udc: avoid sleeping on spinlock
usb: gadget: mv_udc: enable stream mode
usb: gadget: mv_udc: fix boot up hang
Roland Stigge (3):
usb: gadget: lpc32xx_udc: Port to new start/stop interface
usb: gadget: lpc32xx_udc: Remove usb_endpoint_descriptor
usb: gadget: lpc32xx_udc: Support multiple controllers
Sachin Kamat (9):
usb: gadget: s3c2410_udc: Replace <asm/io.h> with <linux/io.h>
usb: gadget: s3c2410_udc: Use pr_* and dev_err functions
usb: gadget: s3c2410_udc: Silence checkpatch errors and warnings
usb: gadget: s3c2410_udc: Move assignment outside if condition
usb: gadget: s3c2410_udc: Do not use integer for NULL
usb: gadget: s3c-hsudc: Use devm_* functions
usb: gadget: s3c-hsudc: Add missing braces around sizeof
usb: gadget: s3c-hsudc: Replace 0 with NULL for pointers
usb: gadget: s3c-hsotg: Use devm_clk_get function
Sebastian Andrzej Siewior (32):
staging: ccg: Add a note about compatibility issues.
usb: gadget: move bind callback into driver struct usb_composite_driver
usb: gadget: remove __devexit in f_uac2
usb: gadget: push all usb_composite_driver structs into __refdata
usb: gadget: move bind() callback back to struct usb_composite_driver
usb: gadget: move bind() callback back to struct usb_gadget_driver
staging: ccg: include all sourced files
usb: gadget: remove global variable composite in composite.c
usb: gadget: pxa25x: make it compile with debug again
usb: gadget: start with libcomposite
usb: gadget: libcomposite: move config.c into libcomposite
usb: gadget: move global vars from epautoconf into struct usb_gadget
usb: gadget: libcomposite: add epautoconf.c to libcomposite
usb: gadget: move USB_BUFSIZ into global composite.h
usb: gadget: remove bufsiz from struct usb_composite_dev
usb: gadget: make composite module options readonly only
usb: gadget: use usb_string_ids_tab instead multiple usb_string_id()
usb: gadget: make g_printer enumerate again
usb: gadget: initialize the strings in tcm_usb_gadget properly
usb: gadget: move usb_gadget_controller_number() into a .c file and libcomposite
usb: gadget: push VID/PID/USB BCD module option into gadgets
usb: gadget: make sure each gadget is using same index for Product, Serial,…
usb: gadget: push iSerialNumber into gadgets
usb: gadget: push iManufacturer into gadgets
usb: gadget: push iProduct into gadgets
usb: gadget: remove string override from struct usb_composite_driver
usb: gadget: Provide a default implementation of default manufacturer string
usb: gadget: libcomposite: move composite.c into libcomposite
usb: gadget: libcomposite: move MODULE_VERSION to composite.c
usb: gadget: remove usb_gadget_controller_number()
usb: gadget: add module.h to u_ether.c
usb: gadget serial: don't shift bcd version left by 16
Shimoda, Yoshihiro (1):
usb: renesas_usbhs: modify the irq handler for sharing irq
Wei Yongjun (2):
usb: gadget: remove duplicated include from pxa25x_udc.c
usb: gadget: at91_udc: move the dereference below the NULL test
Yunfan Zhang (1):
usb: gadget: mv_udc: fix hang when shutdown
drivers/staging/ccg/Kconfig | 5 +
drivers/staging/ccg/Makefile | 2 -
drivers/staging/ccg/ccg.c | 29 +-
drivers/staging/ccg/composite.c | 1688 ++++++++++++++++++
drivers/staging/ccg/composite.h | 395 +++++
drivers/staging/ccg/config.c | 158 ++
drivers/staging/ccg/epautoconf.c | 393 +++++
drivers/staging/ccg/f_acm.c | 814 +++++++++
drivers/staging/ccg/f_fs.c | 2455 ++++++++++++++++++++++++++
drivers/staging/ccg/f_mass_storage.c | 3135 ++++++++++++++++++++++++++++++++++
drivers/staging/ccg/f_rndis.c | 918 ++++++++++
drivers/staging/ccg/gadget_chips.h | 150 ++
drivers/staging/ccg/ndis.h | 47 +
drivers/staging/ccg/rndis.c | 1175 +++++++++++++
drivers/staging/ccg/rndis.h | 222 +++
drivers/staging/ccg/storage_common.c | 893 ++++++++++
drivers/staging/ccg/u_ether.c | 986 +++++++++++
drivers/staging/ccg/u_ether.h | 154 ++
drivers/staging/ccg/u_serial.c | 1341 +++++++++++++++
drivers/staging/ccg/u_serial.h | 65 +
drivers/staging/ccg/usbstring.c | 71 +
drivers/usb/chipidea/Kconfig | 1 -
drivers/usb/dwc3/Kconfig | 2 -
drivers/usb/gadget/Kconfig | 61 +-
drivers/usb/gadget/Makefile | 4 +
drivers/usb/gadget/acm_ms.c | 55 +-
drivers/usb/gadget/amd5536udc.c | 6 +-
drivers/usb/gadget/at91_udc.c | 5 +-
drivers/usb/gadget/audio.c | 62 +-
drivers/usb/gadget/bcm63xx_udc.c | 2464 ++++++++++++++++++++++++++
drivers/usb/gadget/cdc2.c | 56 +-
drivers/usb/gadget/composite.c | 290 ++--
drivers/usb/gadget/config.c | 6 +-
drivers/usb/gadget/dbgp.c | 11 +-
drivers/usb/gadget/dummy_hcd.c | 2 +
drivers/usb/gadget/epautoconf.c | 33 +-
drivers/usb/gadget/ether.c | 61 +-
drivers/usb/gadget/f_ecm.c | 5 +-
drivers/usb/gadget/f_hid.c | 2 +-
drivers/usb/gadget/f_mass_storage.c | 16 +-
drivers/usb/gadget/f_midi.c | 1 -
drivers/usb/gadget/f_ncm.c | 5 +-
drivers/usb/gadget/f_sourcesink.c | 2 +-
drivers/usb/gadget/f_subset.c | 5 +-
drivers/usb/gadget/f_uac2.c | 2 +-
drivers/usb/gadget/file_storage.c | 38 +-
drivers/usb/gadget/fsl_udc_core.c | 6 +-
drivers/usb/gadget/fusb300_udc.c | 4 +-
drivers/usb/gadget/g_ffs.c | 26 +-
drivers/usb/gadget/gadget_chips.h | 96 +-
drivers/usb/gadget/gmidi.c | 61 +-
drivers/usb/gadget/goku_udc.c | 6 +-
drivers/usb/gadget/hid.c | 52 +-
drivers/usb/gadget/inode.c | 29 +-
drivers/usb/gadget/lpc32xx_udc.c | 129 +-
drivers/usb/gadget/m66592-udc.c | 4 +-
drivers/usb/gadget/mass_storage.c | 39 +-
drivers/usb/gadget/multi.c | 42 +-
drivers/usb/gadget/mv_udc_core.c | 91 +-
drivers/usb/gadget/ncm.c | 62 +-
drivers/usb/gadget/nokia.c | 58 +-
drivers/usb/gadget/omap_udc.c | 6 +-
drivers/usb/gadget/pch_udc.c | 6 +-
drivers/usb/gadget/printer.c | 173 +-
drivers/usb/gadget/pxa25x_udc.c | 7 +-
drivers/usb/gadget/pxa25x_udc.h | 2 +-
drivers/usb/gadget/pxa27x_udc.c | 6 +-
drivers/usb/gadget/rndis.c | 22 +-
drivers/usb/gadget/s3c-hsotg.c | 8 +-
drivers/usb/gadget/s3c-hsudc.c | 51 +-
drivers/usb/gadget/s3c2410_udc.c | 148 +-
drivers/usb/gadget/serial.c | 72 +-
drivers/usb/gadget/tcm_usb_gadget.c | 49 +-
drivers/usb/gadget/tcm_usb_gadget.h | 11 +-
drivers/usb/gadget/u_ether.c | 8 +-
drivers/usb/gadget/udc-core.c | 13 +-
drivers/usb/gadget/usbstring.c | 3 +-
drivers/usb/gadget/webcam.c | 42 +-
drivers/usb/gadget/zero.c | 73 +-
drivers/usb/musb/Kconfig | 1 -
drivers/usb/renesas_usbhs/mod.c | 25 +-
include/linux/usb/composite.h | 97 +-
include/linux/usb/gadget.h | 33 +-
83 files changed, 18446 insertions(+), 1406 deletions(-)
create mode 100644 drivers/staging/ccg/composite.c
create mode 100644 drivers/staging/ccg/composite.h
create mode 100644 drivers/staging/ccg/config.c
create mode 100644 drivers/staging/ccg/epautoconf.c
create mode 100644 drivers/staging/ccg/f_acm.c
create mode 100644 drivers/staging/ccg/f_fs.c
create mode 100644 drivers/staging/ccg/f_mass_storage.c
create mode 100644 drivers/staging/ccg/f_rndis.c
create mode 100644 drivers/staging/ccg/gadget_chips.h
create mode 100644 drivers/staging/ccg/ndis.h
create mode 100644 drivers/staging/ccg/rndis.c
create mode 100644 drivers/staging/ccg/rndis.h
create mode 100644 drivers/staging/ccg/storage_common.c
create mode 100644 drivers/staging/ccg/u_ether.c
create mode 100644 drivers/staging/ccg/u_ether.h
create mode 100644 drivers/staging/ccg/u_serial.c
create mode 100644 drivers/staging/ccg/u_serial.h
create mode 100644 drivers/staging/ccg/usbstring.c
create mode 100644 drivers/usb/gadget/bcm63xx_udc.c
--
balbi
Attachment:
signature.asc
Description: Digital signature
