Hi Greg,
Here are gadget patches for v3.8, and it also conflicts with your
usb-next branch. Below you can find my resolution (suggested
by Kuninori):
diff --cc drivers/usb/renesas_usbhs/fifo.c
index c021b20,72ad375..9538f0f
--- a/drivers/usb/renesas_usbhs/fifo.c
+++ b/drivers/usb/renesas_usbhs/fifo.c
@@@ -795,7 -798,7 +798,8 @@@ static void xfer_work(struct work_struc
dev_dbg(dev, " %s %d (%d/ %d)\n",
fifo->name, usbhs_pipe_number(pipe), pkt->length, pkt->zero);
+ usbhs_pipe_set_trans_count_if_bulk(pipe, pkt->trans);
+ usbhs_pipe_enable(pipe);
usbhsf_dma_start(pipe, fifo);
dma_async_issue_pending(chan);
}
The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:
Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/gadget-for-v3.8
for you to fetch changes up to f72e3b78867142a19b77f1de0698ce8b03dc6cbd:
usb: gadget: ncm: correct endianess conversion (2012-11-08 16:05:39 +0200)
----------------------------------------------------------------
usb: gadget: patches for v3.8
renesas_usbhs implements ->pullup() method, switches over
to devm_request_irq(), adds support for DMA Engine and
got a few miscelaneous cleanups.
The NCM gadget got an endianness fix and the Ethernet
gadget a frame size fix.
We're finally removing the g_file_storage gadget and
sticking to g_mass_storage and the new tcm_usb_gadget
gadgets since that was a huge duplicaton of effort anyway.
While removing g_file_storage, we also had to fix a bunch
of defconfigs which were still pointing to the old gadget.
There's a big series getting us closer to being able to
introduce our configfs interface. The series converts
functions into loadable modules which will, eventually,
be registered to the configfs interface.
Other than that there's the usual typo fixes and miscelaneous
cleanups all over the place.
----------------------------------------------------------------
Alexandre Pereira da Silva (1):
usb: gadget: lpc32xx_udc: Disable setup request error
Dmytro Milinevskyy (1):
usb: gadget: ncm: correct endianess conversion
Ian Coolidge (1):
usb: gadget: g_ether: fix frame size check
Kuninori Morimoto (7):
usb: renesas_usbhs: gadget: add usb_gadget_ops :: pullup support
usb: renesas_usbhs: use devm_request_irq()
usb: renesas_usbhs: fixup unreadable macro
usb: renesas_usbhs: add DMAEngine support on mod_host
usb: renesas_usbhs: remove debug information from usbhsh_hub_status_data()
usb: renesas_usbhs: host: add endpoint user counter
usb: renesas_usbhs: use transfer counter if IN direction bulk pipe
Masanari Iida (1):
usb: fix typo in drivers/usb
Michal Nazarewicz (6):
arch: Change defconfigs to point to g_mass_storage.
usb: gadget: Remove File-backed Storage Gadget (g_file_storage).
usb: gadget: storage_common: Remove FSG specific definitions.
usb: gadget: storage_common: Drop #ifdefs used for the sake of FSG.
usb: gadget: storage_common: Make fsg_lun_is_open() a function.
usb: gadget: Remove reference to is_dualspeed from sysfs.
Sebastian Andrzej Siewior (19):
usb: gadget: ecm: Add IAD descriptor in SS mode
usb: gadget: tcm_usb_gadget: NULL terminate the FS descriptor list
usb: gadget: use a computation macro for INT endpoint interval
usb: gadget storage: use a computation macro for INT endpoint interval
usb: gadget: uac2: add some error recovery in afunc_bind()
usb: gadget: network: fix bind() error path
usb: gadget: audio: remove c->highpseed = true from f_midi and uac1
usb: gadget: midi: free hs descriptors
usb: gadget: midi: make FS and HS available
usb: gadget: phonet: free requests in pn_bind()'s error path
usb: gadget: uvc: fix error path in uvc_function_bind()
usb: gadget: always update HS/SS descriptors and create a copy of them
usb: gadget: remove DMA_ADDR_INVALID from f_uac2 and gadgetfs
usb: gadget: uac2: provide a variable for interface and alt settings
usb: gadget: uac2: use the strings directly
usb: gadget: let f_* use usb_string_ids_tab() where it makes sense
usb: gadget: dummy_hdc: prepare for multiple instances
usb: gadget: dummy_hcd: add setup / cleanup of multiple HW intances
usb: gadget: dummy_hcd: remove global the_controller variable
Documentation/DocBook/gadget.tmpl | 2 +-
Documentation/usb/mass-storage.txt | 15 +-
arch/arm/configs/afeb9260_defconfig | 2 +-
arch/arm/configs/at91sam9260_defconfig | 2 +-
arch/arm/configs/at91sam9261_defconfig | 2 +-
arch/arm/configs/at91sam9263_defconfig | 2 +-
arch/arm/configs/at91sam9g20_defconfig | 2 +-
arch/arm/configs/corgi_defconfig | 2 +-
arch/arm/configs/davinci_all_defconfig | 2 +-
arch/arm/configs/h7202_defconfig | 3 +-
arch/arm/configs/magician_defconfig | 2 +-
arch/arm/configs/mini2440_defconfig | 2 +-
arch/arm/configs/omap1_defconfig | 3 +-
arch/arm/configs/prima2_defconfig | 1 -
arch/arm/configs/spitz_defconfig | 2 +-
arch/arm/configs/stamp9g20_defconfig | 2 +-
arch/arm/configs/viper_defconfig | 2 +-
arch/arm/configs/zeus_defconfig | 2 +-
arch/avr32/configs/atngw100_defconfig | 2 +-
arch/avr32/configs/atngw100_evklcd100_defconfig | 2 +-
arch/avr32/configs/atngw100_evklcd101_defconfig | 2 +-
arch/avr32/configs/atngw100_mrmt_defconfig | 2 +-
arch/avr32/configs/atngw100mkii_defconfig | 2 +-
.../avr32/configs/atngw100mkii_evklcd100_defconfig | 2 +-
.../avr32/configs/atngw100mkii_evklcd101_defconfig | 2 +-
arch/avr32/configs/atstk1002_defconfig | 2 +-
arch/avr32/configs/atstk1003_defconfig | 2 +-
arch/avr32/configs/atstk1004_defconfig | 2 +-
arch/avr32/configs/atstk1006_defconfig | 2 +-
arch/avr32/configs/favr-32_defconfig | 2 +-
arch/avr32/configs/hammerhead_defconfig | 2 +-
arch/blackfin/configs/CM-BF527_defconfig | 2 +-
arch/blackfin/configs/CM-BF548_defconfig | 2 +-
arch/blackfin/configs/CM-BF561_defconfig | 2 +-
arch/mips/configs/bcm47xx_defconfig | 2 +-
arch/mips/configs/mtx1_defconfig | 2 +-
arch/sh/configs/ecovec24_defconfig | 2 +-
arch/sh/configs/se7724_defconfig | 2 +-
drivers/usb/chipidea/debug.c | 3 -
drivers/usb/gadget/Kconfig | 29 +-
drivers/usb/gadget/Makefile | 2 -
drivers/usb/gadget/composite.c | 8 +-
drivers/usb/gadget/config.c | 39 +-
drivers/usb/gadget/dummy_hcd.c | 170 +-
drivers/usb/gadget/f_acm.c | 79 +-
drivers/usb/gadget/f_ecm.c | 112 +-
drivers/usb/gadget/f_eem.c | 51 +-
drivers/usb/gadget/f_fs.c | 4 +-
drivers/usb/gadget/f_hid.c | 30 +-
drivers/usb/gadget/f_loopback.c | 28 +-
drivers/usb/gadget/f_mass_storage.c | 63 +-
drivers/usb/gadget/f_midi.c | 14 +-
drivers/usb/gadget/f_ncm.c | 94 +-
drivers/usb/gadget/f_obex.c | 42 +-
drivers/usb/gadget/f_phonet.c | 21 +-
drivers/usb/gadget/f_rndis.c | 94 +-
drivers/usb/gadget/f_serial.c | 38 +-
drivers/usb/gadget/f_sourcesink.c | 104 +-
drivers/usb/gadget/f_subset.c | 75 +-
drivers/usb/gadget/f_uac1.c | 23 +-
drivers/usb/gadget/f_uac2.c | 220 +-
drivers/usb/gadget/f_uvc.c | 138 +-
drivers/usb/gadget/file_storage.c | 3656 --------------------
drivers/usb/gadget/fsl_udc_core.c | 2 +-
drivers/usb/gadget/inode.c | 3 -
drivers/usb/gadget/lpc32xx_udc.c | 2 +-
drivers/usb/gadget/net2280.c | 2 +-
drivers/usb/gadget/printer.c | 12 +-
drivers/usb/gadget/pxa27x_udc.h | 2 +-
drivers/usb/gadget/storage_common.c | 165 +-
drivers/usb/gadget/tcm_usb_gadget.c | 13 +-
drivers/usb/gadget/u_ether.c | 3 +-
drivers/usb/gadget/udc-core.c | 11 -
drivers/usb/musb/musb_dsps.c | 2 +-
drivers/usb/renesas_usbhs/common.c | 5 +
drivers/usb/renesas_usbhs/common.h | 1 +
drivers/usb/renesas_usbhs/fifo.c | 14 +-
drivers/usb/renesas_usbhs/mod.c | 3 +-
drivers/usb/renesas_usbhs/mod_gadget.c | 11 +
drivers/usb/renesas_usbhs/mod_host.c | 45 +-
drivers/usb/renesas_usbhs/pipe.c | 101 +
drivers/usb/renesas_usbhs/pipe.h | 1 +
include/linux/usb/composite.h | 4 +-
include/linux/usb/gadget.h | 7 +
84 files changed, 833 insertions(+), 4803 deletions(-)
delete mode 100644 drivers/usb/gadget/file_storage.c
--
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
