Hi Greg, A few more changes for the Gadget framework for 3.3 merge window. We are adding the Scatter/Gather support to gadget framework and the first controller to use it is the DWC3 driver. You will find a conflict when merging this branch. Here's the fix: diff --cc drivers/usb/gadget/Kconfig index 93f6c80,683d931..1fe87aa --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@@ -310,14 -308,26 +309,14 @@@ config USB_S3C_HSUD This driver has been tested on S3C2416 and S3C2450 processors. - config USB_PXA_U2O - tristate "PXA9xx Processor USB2.0 controller" - depends on ARCH_MMP + config USB_MV_UDC + tristate "Marvell USB2.0 Device Controller" select USB_GADGET_DUALSPEED help - PXA9xx Processor series include a high speed USB2.0 device - controller, which support high speed and full speed USB peripheral. + Marvell Socs (including PXA and MMP series) include a high speed + USB2.0 OTG controller, which can be configured as high speed or + full speed USB peripheral. -config USB_GADGET_DWC3 - tristate "DesignWare USB3.0 (DRD) Controller" - depends on USB_DWC3 - select USB_GADGET_DUALSPEED - select USB_GADGET_SUPERSPEED - help - DesignWare USB3.0 controller is a SuperSpeed USB3.0 Controller - which can be configured for peripheral-only, host-only, hub-only - and Dual-Role operation. This Controller was first integrated into - the OMAP5 series of processors. More information about the OMAP5 - version of this controller, refer to http://www.ti.com/omap5. - # # Controllers available in both integrated and discrete versions # The following changes since commit 121a8cdd79e2c68ae78c7633f2a46ee65a177ff6: Merge branch 'for-next/gadget' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next (2011-12-13 09:37:40 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git for-gadget/next Dan Carpenter (1): usb: renesas_usbhs: silence a gcc warning Felipe Balbi (6): usb: renesas: pipe: convert a long if into a XOR operation usb: gadget: introduce support for sg lists usb: dwc3: gadget: re-factor dwc3_prepare_trbs() usb: dwc3: gadget: don't return anything on prepare trbs usb: dwc3: gadget: don't force 'LST' always usb: dwc3: gadget: add support for SG lists Felipe Contreras (1): usb: gadget: remove useless depends on Kconfig Heiko Stübner (8): usb: gadget: s3c-hsudc: move platform_data struct to global header usb: gadget: s3c-hsudc: add __devinit to probe function usb: gadget: s3c-hsudc: add missing otg_put_transceiver in probe usb: gadget: s3c-hsudc: move device registration to probe usb: gadget: s3c-hsudc: use udc_start and udc_stop functions usb: gadget: s3c-hsudc: Add regulator handling usb: gadget: s3c-hsudc: use release_mem_region instead of release_resource usb: gadget: s3c-hsudc: remove the_controller global Kuninori Morimoto (1): usb: renesas_usbhs: tidyup for smatch warnings Neil Zhang (6): usb: gadget: mv_udc: fix readl error usb: gadget: mv_udc: rewrite queue_dtd according to spec usb: gadget: mv_udc: fix bug in ep_dequeue usb: gadget: mv_udc: drop ARCH dependency USB: OTG: add Marvell usb OTG driver support USB: EHCI: Add Marvell Host Controller driver Yu Xu (1): usb: gadget: enlarge maxburst bit width. arch/arm/mach-s3c2416/mach-smdk2416.c | 1 + arch/arm/plat-samsung/devs.c | 1 + arch/arm/plat-samsung/include/plat/udc.h | 15 +- drivers/usb/dwc3/gadget.c | 239 +++++--- drivers/usb/gadget/Kconfig | 14 +- drivers/usb/gadget/Makefile | 2 +- drivers/usb/gadget/mv_udc.h | 2 +- drivers/usb/gadget/mv_udc_core.c | 187 +++---- drivers/usb/gadget/s3c-hsudc.c | 117 ++-- drivers/usb/host/Kconfig | 9 + drivers/usb/host/ehci-hcd.c | 5 + drivers/usb/host/ehci-mv.c | 391 ++++++++++++ drivers/usb/otg/Kconfig | 12 + drivers/usb/otg/Makefile | 1 + drivers/usb/otg/mv_otg.c | 957 ++++++++++++++++++++++++++++++ drivers/usb/otg/mv_otg.h | 165 +++++ drivers/usb/renesas_usbhs/mod_gadget.c | 2 +- drivers/usb/renesas_usbhs/mod_host.c | 3 +- drivers/usb/renesas_usbhs/pipe.c | 3 +- include/linux/platform_data/mv_usb.h | 18 +- include/linux/platform_data/s3c-hsudc.h | 34 ++ include/linux/usb/gadget.h | 12 +- 22 files changed, 1911 insertions(+), 279 deletions(-) create mode 100644 drivers/usb/host/ehci-mv.c create mode 100644 drivers/usb/otg/mv_otg.c create mode 100644 drivers/usb/otg/mv_otg.h create mode 100644 include/linux/platform_data/s3c-hsudc.h -- 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
