From: Greg Kroah-Hartman Date: Thu, 22 Dec 2011 22:05:01 +0000 (-0800) Subject: Merge branch 'for-gadget/next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=ee0db58ade2c60342a7d648f375d0a4107c39527;p=deliverable%2Flinux.git Merge branch 'for-gadget/next' of git://git./linux/kernel/git/balbi/usb into usb-next * 'for-gadget/next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb: (24 commits) usb: dwc3: gadget: add support for SG lists usb: dwc3: gadget: don't force 'LST' always usb: dwc3: gadget: don't return anything on prepare trbs usb: dwc3: gadget: re-factor dwc3_prepare_trbs() usb: gadget: introduce support for sg lists usb: renesas: pipe: convert a long if into a XOR operation usb: gadget: remove useless depends on Kconfig usb: gadget: s3c-hsudc: remove the_controller global usb: gadget: s3c-hsudc: use release_mem_region instead of release_resource usb: gadget: s3c-hsudc: Add regulator handling usb: gadget: s3c-hsudc: use udc_start and udc_stop functions usb: gadget: s3c-hsudc: move device registration to probe usb: gadget: s3c-hsudc: add missing otg_put_transceiver in probe usb: gadget: s3c-hsudc: add __devinit to probe function usb: gadget: s3c-hsudc: move platform_data struct to global header USB: EHCI: Add Marvell Host Controller driver USB: OTG: add Marvell usb OTG driver support usb: gadget: mv_udc: drop ARCH dependency usb: gadget: mv_udc: fix bug in ep_dequeue usb: gadget: enlarge maxburst bit width. ... --- ee0db58ade2c60342a7d648f375d0a4107c39527 diff --cc drivers/usb/gadget/Kconfig index 93f6c808f570,683d931c7c52..1fe87aafa087 --- 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 # diff --cc drivers/usb/gadget/mv_udc_core.c index 142a67f06638,f0596ac533e0..f97e737d26f7 --- a/drivers/usb/gadget/mv_udc_core.c +++ b/drivers/usb/gadget/mv_udc_core.c @@@ -2530,11 -2485,24 +2485,10 @@@ static struct platform_driver udc_drive #endif }, }; -MODULE_ALIAS("platform:mv-udc"); +module_platform_driver(udc_driver); - ++MODULE_ALIAS("platform:mv-udc"); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_AUTHOR("Chao Xie "); MODULE_VERSION(DRIVER_VERSION); MODULE_LICENSE("GPL"); - MODULE_ALIAS("platform:pxa-u2o"); - - -static int __init init(void) -{ - return platform_driver_register(&udc_driver); -} -module_init(init); - - -static void __exit cleanup(void) -{ - platform_driver_unregister(&udc_driver); -} -module_exit(cleanup); -