usb: gadget: Gadget directory cleanup - group UDC drivers

The drivers/usb/gadget directory contains many files.
Files which are related can be distributed into separate directories.
This patch moves the UDC drivers into a separate directory.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

51 files changed, 420 insertions, 399 deletions

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 2986a4369df4..5c822afb6d70 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -127,376 +127,7 @@ config USB_GADGET_STORAGE_NUM_BUFFERS
            a module parameter as well.
            If unsure, say 2.
 
-#
-# USB Peripheral Controller Support
-#
-# The order here is alphabetical, except that integrated controllers go
-# before discrete ones so they will be the initial/default value:
-#   - integrated/SOC controllers first
-#   - licensed IP used in both SOC and discrete versions
-#   - discrete ones (including all PCI-only controllers)
-#   - debug/dummy gadget+hcd is last.
-#
-menu "USB Peripheral Controller"
-
-#
-# Integrated controllers
-#
-
-config USB_AT91
-        tristate "Atmel AT91 USB Device Port"
-        depends on ARCH_AT91
-        help
-           Many Atmel AT91 processors (such as the AT91RM2000) have a
-           full speed USB Device Port with support for five configurable
-           endpoints (plus endpoint zero).
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "at91_udc" and force all
-           gadget drivers to also be dynamically linked.
-
-config USB_LPC32XX
-        tristate "LPC32XX USB Peripheral Controller"
-        depends on ARCH_LPC32XX && I2C
-        select USB_ISP1301
-        help
-           This option selects the USB device controller in the LPC32xx SoC.
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "lpc32xx_udc" and force all
-           gadget drivers to also be dynamically linked.
-
-config USB_ATMEL_USBA
-        tristate "Atmel USBA"
-        depends on AVR32 || ARCH_AT91
-        help
-          USBA is the integrated high-speed USB Device controller on
-          the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.
-
-config USB_BCM63XX_UDC
-        tristate "Broadcom BCM63xx Peripheral Controller"
-        depends on BCM63XX
-        help
-           Many Broadcom BCM63xx chipsets (such as the BCM6328) have a
-           high speed USB Device Port with support for four fixed endpoints
-           (plus endpoint zero).
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "bcm63xx_udc".
-
-config USB_FSL_USB2
-        tristate "Freescale Highspeed USB DR Peripheral Controller"
-        depends on FSL_SOC || ARCH_MXC
-        select USB_FSL_MPH_DR_OF if OF
-        help
-           Some of Freescale PowerPC and i.MX processors have a High Speed
-           Dual-Role(DR) USB controller, which supports device mode.
-
-           The number of programmable endpoints is different through
-           SOC revisions.
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "fsl_usb2_udc" and force
-           all gadget drivers to also be dynamically linked.
-
-config USB_FUSB300
-        tristate "Faraday FUSB300 USB Peripheral Controller"
-        depends on !PHYS_ADDR_T_64BIT && HAS_DMA
-        help
-           Faraday usb device controller FUSB300 driver
-
-config USB_FOTG210_UDC
-        depends on HAS_DMA
-        tristate "Faraday FOTG210 USB Peripheral Controller"
-        help
-           Faraday USB2.0 OTG controller which can be configured as
-           high speed or full speed USB device. This driver supppors
-           Bulk Transfer so far.
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "fotg210_udc".
-
-config USB_GR_UDC
-       tristate "Aeroflex Gaisler GRUSBDC USB Peripheral Controller Driver"
-       depends on HAS_DMA
-       help
-          Select this to support Aeroflex Gaisler GRUSBDC cores from the GRLIB
-          VHDL IP core library.
-
-config USB_OMAP
-        tristate "OMAP USB Device Controller"
-        depends on ARCH_OMAP1
-        depends on ISP1301_OMAP || !(MACH_OMAP_H2 || MACH_OMAP_H3)
-        help
-           Many Texas Instruments OMAP processors have flexible full
-           speed USB device controllers, with support for up to 30
-           endpoints (plus endpoint zero).  This driver supports the
-           controller in the OMAP 1611, and should work with controllers
-           in other OMAP processors too, given minor tweaks.
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "omap_udc" and force all
-           gadget drivers to also be dynamically linked.
-
-config USB_PXA25X
-        tristate "PXA 25x or IXP 4xx"
-        depends on (ARCH_PXA && PXA25x) || ARCH_IXP4XX
-        help
-           Intel's PXA 25x series XScale ARM-5TE processors include
-           an integrated full speed USB 1.1 device controller.  The
-           controller in the IXP 4xx series is register-compatible.
-
-           It has fifteen fixed-function endpoints, as well as endpoint
-           zero (for control transfers).
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "pxa25x_udc" and force all
-           gadget drivers to also be dynamically linked.
-
-# if there's only one gadget driver, using only two bulk endpoints,
-# don't waste memory for the other endpoints
-config USB_PXA25X_SMALL
-        depends on USB_PXA25X
-        bool
-        default n if USB_ETH_RNDIS
-        default y if USB_ZERO
-        default y if USB_ETH
-        default y if USB_G_SERIAL
-
-config USB_R8A66597
-        tristate "Renesas R8A66597 USB Peripheral Controller"
-        depends on HAS_DMA
-        help
-           R8A66597 is a discrete USB host and peripheral controller chip that
-           supports both full and high speed USB 2.0 data transfers.
-           It has nine configurable endpoints, and endpoint zero.
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "r8a66597_udc" and force all
-           gadget drivers to also be dynamically linked.
-
-config USB_RENESAS_USBHS_UDC
-        tristate 'Renesas USBHS controller'
-        depends on USB_RENESAS_USBHS
-        help
-           Renesas USBHS is a discrete USB host and peripheral controller chip
-           that supports both full and high speed USB 2.0 data transfers.
-           It has nine or more configurable endpoints, and endpoint zero.
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "renesas_usbhs" and force all
-           gadget drivers to also be dynamically linked.
-
-config USB_PXA27X
-        tristate "PXA 27x"
-        help
-           Intel's PXA 27x series XScale ARM v5TE processors include
-           an integrated full speed USB 1.1 device controller.
-
-           It has up to 23 endpoints, as well as endpoint zero (for
-           control transfers).
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "pxa27x_udc" and force all
-           gadget drivers to also be dynamically linked.
-
-config USB_S3C2410
-        tristate "S3C2410 USB Device Controller"
-        depends on ARCH_S3C24XX
-        help
-          Samsung's S3C2410 is an ARM-4 processor with an integrated
-          full speed USB 1.1 device controller.  It has 4 configurable
-          endpoints, as well as endpoint zero (for control transfers).
-
-          This driver has been tested on the S3C2410, S3C2412, and
-          S3C2440 processors.
-
-config USB_S3C2410_DEBUG
-        boolean "S3C2410 udc debug messages"
-        depends on USB_S3C2410
-
-config USB_S3C_HSUDC
-        tristate "S3C2416, S3C2443 and S3C2450 USB Device Controller"
-        depends on ARCH_S3C24XX
-        help
-          Samsung's S3C2416, S3C2443 and S3C2450 is an ARM9 based SoC
-          integrated with dual speed USB 2.0 device controller. It has
-          8 endpoints, as well as endpoint zero.
-
-          This driver has been tested on S3C2416 and S3C2450 processors.
-
-config USB_MV_UDC
-        tristate "Marvell USB2.0 Device Controller"
-        depends on HAS_DMA
-        help
-          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_MV_U3D
-        depends on HAS_DMA
-        tristate "MARVELL PXA2128 USB 3.0 controller"
-        help
-          MARVELL PXA2128 Processor series include a super speed USB3.0 device
-          controller, which support super speed USB peripheral.
-
-#
-# Controllers available in both integrated and discrete versions
-#
-
-config USB_M66592
-        tristate "Renesas M66592 USB Peripheral Controller"
-        help
-           M66592 is a discrete USB peripheral controller chip that
-           supports both full and high speed USB 2.0 data transfers.
-           It has seven configurable endpoints, and endpoint zero.
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "m66592_udc" and force all
-           gadget drivers to also be dynamically linked.
-
-#
-# Controllers available only in discrete form (and all PCI controllers)
-#
-
-config USB_AMD5536UDC
-        tristate "AMD5536 UDC"
-        depends on PCI
-        help
-           The AMD5536 UDC is part of the AMD Geode CS5536, an x86 southbridge.
-           It is a USB Highspeed DMA capable USB device controller. Beside ep0
-           it provides 4 IN and 4 OUT endpoints (bulk or interrupt type).
-           The UDC port supports OTG operation, and may be used as a host port
-           if it's not being used to implement peripheral or OTG roles.
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "amd5536udc" and force all
-           gadget drivers to also be dynamically linked.
-
-config USB_FSL_QE
-        tristate "Freescale QE/CPM USB Device Controller"
-        depends on FSL_SOC && (QUICC_ENGINE || CPM)
-        help
-           Some of Freescale PowerPC processors have a Full Speed
-           QE/CPM2 USB controller, which support device mode with 4
-           programmable endpoints. This driver supports the
-           controller in the MPC8360 and MPC8272, and should work with
-           controllers having QE or CPM2, given minor tweaks.
-
-           Set CONFIG_USB_GADGET to "m" to build this driver as a
-           dynamically linked module called "fsl_qe_udc".
-
-config USB_NET2272
-        tristate "PLX NET2272"
-        help
-          PLX NET2272 is a USB peripheral controller which supports
-          both full and high speed USB 2.0 data transfers.
-
-          It has three configurable endpoints, as well as endpoint zero
-          (for control transfer).
-          Say "y" to link the driver statically, or "m" to build a
-          dynamically linked module called "net2272" and force all
-          gadget drivers to also be dynamically linked.
-
-config USB_NET2272_DMA
-        boolean "Support external DMA controller"
-        depends on USB_NET2272 && HAS_DMA
-        help
-          The NET2272 part can optionally support an external DMA
-          controller, but your board has to have support in the
-          driver itself.
-
-          If unsure, say "N" here.  The driver works fine in PIO mode.
-
-config USB_NET2280
-        tristate "NetChip 228x / PLX USB338x"
-        depends on PCI
-        help
-           NetChip 2280 / 2282 is a PCI based USB peripheral controller which
-           supports both full and high speed USB 2.0 data transfers.
-
-           It has six configurable endpoints, as well as endpoint zero
-           (for control transfers) and several endpoints with dedicated
-           functions.
-
-           PLX 3380 / 3382 is a PCIe based USB peripheral controller which
-           supports full, high speed USB 2.0 and super speed USB 3.0
-           data transfers.
-
-           It has eight configurable endpoints, as well as endpoint zero
-           (for control transfers) and several endpoints with dedicated
-           functions.
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "net2280" and force all
-           gadget drivers to also be dynamically linked.
-
-config USB_GOKU
-        tristate "Toshiba TC86C001 'Goku-S'"
-        depends on PCI
-        help
-           The Toshiba TC86C001 is a PCI device which includes controllers
-           for full speed USB devices, IDE, I2C, SIO, plus a USB host (OHCI).
-
-           The device controller has three configurable (bulk or interrupt)
-           endpoints, plus endpoint zero (for control transfers).
-
-           Say "y" to link the driver statically, or "m" to build a
-           dynamically linked module called "goku_udc" and to force all
-           gadget drivers to also be dynamically linked.
-
-config USB_EG20T
-        tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"
-        depends on PCI
-        help
-          This is a USB device driver for EG20T PCH.
-          EG20T PCH is the platform controller hub that is used in Intel's
-          general embedded platform. EG20T PCH has USB device interface.
-          Using this interface, it is able to access system devices connected
-          to USB device.
-          This driver enables USB device function.
-          USB device is a USB peripheral controller which
-          supports both full and high speed USB 2.0 data transfers.
-          This driver supports both control transfer and bulk transfer modes.
-          This driver dose not support interrupt transfer or isochronous
-          transfer modes.
-
-          This driver also can be used for LAPIS Semiconductor's ML7213 which is
-          for IVI(In-Vehicle Infotainment) use.
-          ML7831 is for general purpose use.
-          ML7213/ML7831 is companion chip for Intel Atom E6xx series.
-          ML7213/ML7831 is completely compatible for Intel EG20T PCH.
-
-#
-# LAST -- dummy/emulated controller
-#
-
-config USB_DUMMY_HCD
-        tristate "Dummy HCD (DEVELOPMENT)"
-        depends on USB=y || (USB=m && USB_GADGET=m)
-        help
-          This host controller driver emulates USB, looping all data transfer
-          requests back to a USB "gadget driver" in the same host.  The host
-          side is the master; the gadget side is the slave.  Gadget drivers
-          can be high, full, or low speed; and they have access to endpoints
-          like those from NET2280, PXA2xx, or SA1100 hardware.
-
-          This may help in some stages of creating a driver to embed in a
-          Linux device, since it lets you debug several parts of the gadget
-          driver without its hardware or drivers being involved.
-
-          Since such a gadget side driver needs to interoperate with a host
-          side Linux-USB device driver, this may help to debug both sides
-          of a USB protocol stack.
-
-          Say "y" to link the driver statically, or "m" to build a
-          dynamically linked module called "dummy_hcd" and force all
-          gadget drivers to also be dynamically linked.
-
-# NOTE:  Please keep dummy_hcd LAST so that "real hardware" appears
-# first and will be selected by default.
-
-endmenu
+source "drivers/usb/gadget/udc/Kconfig"
 
 #
 # USB Gadget Drivers
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 61d2503ef561..c144102ea793 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -3,38 +3,11 @@
 #
 subdir-ccflags-$(CONFIG_USB_GADGET_DEBUG)       := -DDEBUG
 subdir-ccflags-$(CONFIG_USB_GADGET_VERBOSE)     += -DVERBOSE_DEBUG
+ccflags-y                               += -I$(PWD)/drivers/usb/gadget/udc
 
-obj-$(CONFIG_USB_GADGET)        += udc-core.o
 obj-$(CONFIG_USB_LIBCOMPOSITE)  += libcomposite.o
 libcomposite-y                  := usbstring.o config.o epautoconf.o
 libcomposite-y                  += composite.o functions.o configfs.o u_f.o
-obj-$(CONFIG_USB_DUMMY_HCD)     += dummy_hcd.o
-obj-$(CONFIG_USB_NET2272)       += net2272.o
-obj-$(CONFIG_USB_NET2280)       += net2280.o
-obj-$(CONFIG_USB_AMD5536UDC)    += amd5536udc.o
-obj-$(CONFIG_USB_PXA25X)        += pxa25x_udc.o
-obj-$(CONFIG_USB_PXA27X)        += pxa27x_udc.o
-obj-$(CONFIG_USB_GOKU)          += goku_udc.o
-obj-$(CONFIG_USB_OMAP)          += omap_udc.o
-obj-$(CONFIG_USB_S3C2410)       += s3c2410_udc.o
-obj-$(CONFIG_USB_AT91)          += at91_udc.o
-obj-$(CONFIG_USB_ATMEL_USBA)    += atmel_usba_udc.o
-obj-$(CONFIG_USB_BCM63XX_UDC)   += bcm63xx_udc.o
-obj-$(CONFIG_USB_FSL_USB2)      += fsl_usb2_udc.o
-fsl_usb2_udc-y                  := fsl_udc_core.o
-fsl_usb2_udc-$(CONFIG_ARCH_MXC) += fsl_mxc_udc.o
-obj-$(CONFIG_USB_M66592)        += m66592-udc.o
-obj-$(CONFIG_USB_R8A66597)      += r8a66597-udc.o
-obj-$(CONFIG_USB_FSL_QE)        += fsl_qe_udc.o
-obj-$(CONFIG_USB_S3C_HSUDC)     += s3c-hsudc.o
-obj-$(CONFIG_USB_LPC32XX)       += lpc32xx_udc.o
-obj-$(CONFIG_USB_EG20T)         += pch_udc.o
-obj-$(CONFIG_USB_MV_UDC)        += mv_udc.o
-mv_udc-y                        := mv_udc_core.o
-obj-$(CONFIG_USB_FUSB300)       += fusb300_udc.o
-obj-$(CONFIG_USB_FOTG210_UDC)   += fotg210-udc.o
-obj-$(CONFIG_USB_MV_U3D)        += mv_u3d_core.o
-obj-$(CONFIG_USB_GR_UDC)        += gr_udc.o
 
 # USB Functions
 usb_f_acm-y                     := f_acm.o
@@ -64,4 +37,4 @@ obj-$(CONFIG_USB_F_MASS_STORAGE)+= usb_f_mass_storage.o
 usb_f_fs-y                      := f_fs.o
 obj-$(CONFIG_USB_F_FS)          += usb_f_fs.o
 
-obj-$(CONFIG_USB_GADGET)        += legacy/
+obj-$(CONFIG_USB_GADGET)        += udc/ legacy/
diff --git a/drivers/usb/gadget/legacy/Makefile b/drivers/usb/gadget/legacy/Makefile
index fbb32aa6f690..d4570744e106 100644
--- a/drivers/usb/gadget/legacy/Makefile
+++ b/drivers/usb/gadget/legacy/Makefile
@@ -3,6 +3,7 @@
 #
 
 ccflags-y                       := -I$(PWD)/drivers/usb/gadget/
+ccflags-y                       += -I$(PWD)/drivers/usb/gadget/udc/
 
 g_zero-y                        := zero.o
 g_audio-y                       := audio.o
diff --git a/drivers/usb/gadget/udc/Kconfig b/drivers/usb/gadget/udc/Kconfig
new file mode 100644
index 000000000000..5151f947a4f5
--- /dev/null
+++ b/drivers/usb/gadget/udc/Kconfig
@@ -0,0 +1,385 @@
+#
+# USB Gadget support on a system involves
+#    (a) a peripheral controller, and
+#    (b) the gadget driver using it.
+#
+# NOTE:  Gadget support ** DOES NOT ** depend on host-side CONFIG_USB !!
+#
+#  - Host systems (like PCs) need CONFIG_USB (with "A" jacks).
+#  - Peripherals (like PDAs) need CONFIG_USB_GADGET (with "B" jacks).
+#  - Some systems have both kinds of controllers.
+#
+# With help from a special transceiver and a "Mini-AB" jack, systems with
+# both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG).
+#
+
+#
+# USB Peripheral Controller Support
+#
+# The order here is alphabetical, except that integrated controllers go
+# before discrete ones so they will be the initial/default value:
+#   - integrated/SOC controllers first
+#   - licensed IP used in both SOC and discrete versions
+#   - discrete ones (including all PCI-only controllers)
+#   - debug/dummy gadget+hcd is last.
+#
+menu "USB Peripheral Controller"
+
+#
+# Integrated controllers
+#
+
+config USB_AT91
+        tristate "Atmel AT91 USB Device Port"
+        depends on ARCH_AT91
+        help
+           Many Atmel AT91 processors (such as the AT91RM2000) have a
+           full speed USB Device Port with support for five configurable
+           endpoints (plus endpoint zero).
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "at91_udc" and force all
+           gadget drivers to also be dynamically linked.
+
+config USB_LPC32XX
+        tristate "LPC32XX USB Peripheral Controller"
+        depends on ARCH_LPC32XX && I2C
+        select USB_ISP1301
+        help
+           This option selects the USB device controller in the LPC32xx SoC.
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "lpc32xx_udc" and force all
+           gadget drivers to also be dynamically linked.
+
+config USB_ATMEL_USBA
+        tristate "Atmel USBA"
+        depends on AVR32 || ARCH_AT91
+        help
+          USBA is the integrated high-speed USB Device controller on
+          the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.
+
+config USB_BCM63XX_UDC
+        tristate "Broadcom BCM63xx Peripheral Controller"
+        depends on BCM63XX
+        help
+           Many Broadcom BCM63xx chipsets (such as the BCM6328) have a
+           high speed USB Device Port with support for four fixed endpoints
+           (plus endpoint zero).
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "bcm63xx_udc".
+
+config USB_FSL_USB2
+        tristate "Freescale Highspeed USB DR Peripheral Controller"
+        depends on FSL_SOC || ARCH_MXC
+        select USB_FSL_MPH_DR_OF if OF
+        help
+           Some of Freescale PowerPC and i.MX processors have a High Speed
+           Dual-Role(DR) USB controller, which supports device mode.
+
+           The number of programmable endpoints is different through
+           SOC revisions.
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "fsl_usb2_udc" and force
+           all gadget drivers to also be dynamically linked.
+
+config USB_FUSB300
+        tristate "Faraday FUSB300 USB Peripheral Controller"
+        depends on !PHYS_ADDR_T_64BIT && HAS_DMA
+        help
+           Faraday usb device controller FUSB300 driver
+
+config USB_FOTG210_UDC
+        depends on HAS_DMA
+        tristate "Faraday FOTG210 USB Peripheral Controller"
+        help
+           Faraday USB2.0 OTG controller which can be configured as
+           high speed or full speed USB device. This driver supppors
+           Bulk Transfer so far.
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "fotg210_udc".
+
+config USB_GR_UDC
+       tristate "Aeroflex Gaisler GRUSBDC USB Peripheral Controller Driver"
+       depends on HAS_DMA
+       help
+          Select this to support Aeroflex Gaisler GRUSBDC cores from the GRLIB
+          VHDL IP core library.
+
+config USB_OMAP
+        tristate "OMAP USB Device Controller"
+        depends on ARCH_OMAP1
+        depends on ISP1301_OMAP || !(MACH_OMAP_H2 || MACH_OMAP_H3)
+        help
+           Many Texas Instruments OMAP processors have flexible full
+           speed USB device controllers, with support for up to 30
+           endpoints (plus endpoint zero).  This driver supports the
+           controller in the OMAP 1611, and should work with controllers
+           in other OMAP processors too, given minor tweaks.
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "omap_udc" and force all
+           gadget drivers to also be dynamically linked.
+
+config USB_PXA25X
+        tristate "PXA 25x or IXP 4xx"
+        depends on (ARCH_PXA && PXA25x) || ARCH_IXP4XX
+        help
+           Intel's PXA 25x series XScale ARM-5TE processors include
+           an integrated full speed USB 1.1 device controller.  The
+           controller in the IXP 4xx series is register-compatible.
+
+           It has fifteen fixed-function endpoints, as well as endpoint
+           zero (for control transfers).
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "pxa25x_udc" and force all
+           gadget drivers to also be dynamically linked.
+
+# if there's only one gadget driver, using only two bulk endpoints,
+# don't waste memory for the other endpoints
+config USB_PXA25X_SMALL
+        depends on USB_PXA25X
+        bool
+        default n if USB_ETH_RNDIS
+        default y if USB_ZERO
+        default y if USB_ETH
+        default y if USB_G_SERIAL
+
+config USB_R8A66597
+        tristate "Renesas R8A66597 USB Peripheral Controller"
+        depends on HAS_DMA
+        help
+           R8A66597 is a discrete USB host and peripheral controller chip that
+           supports both full and high speed USB 2.0 data transfers.
+           It has nine configurable endpoints, and endpoint zero.
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "r8a66597_udc" and force all
+           gadget drivers to also be dynamically linked.
+
+config USB_RENESAS_USBHS_UDC
+        tristate 'Renesas USBHS controller'
+        depends on USB_RENESAS_USBHS
+        help
+           Renesas USBHS is a discrete USB host and peripheral controller chip
+           that supports both full and high speed USB 2.0 data transfers.
+           It has nine or more configurable endpoints, and endpoint zero.
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "renesas_usbhs" and force all
+           gadget drivers to also be dynamically linked.
+
+config USB_PXA27X
+        tristate "PXA 27x"
+        help
+           Intel's PXA 27x series XScale ARM v5TE processors include
+           an integrated full speed USB 1.1 device controller.
+
+           It has up to 23 endpoints, as well as endpoint zero (for
+           control transfers).
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "pxa27x_udc" and force all
+           gadget drivers to also be dynamically linked.
+
+config USB_S3C2410
+        tristate "S3C2410 USB Device Controller"
+        depends on ARCH_S3C24XX
+        help
+          Samsung's S3C2410 is an ARM-4 processor with an integrated
+          full speed USB 1.1 device controller.  It has 4 configurable
+          endpoints, as well as endpoint zero (for control transfers).
+
+          This driver has been tested on the S3C2410, S3C2412, and
+          S3C2440 processors.
+
+config USB_S3C2410_DEBUG
+        boolean "S3C2410 udc debug messages"
+        depends on USB_S3C2410
+
+config USB_S3C_HSUDC
+        tristate "S3C2416, S3C2443 and S3C2450 USB Device Controller"
+        depends on ARCH_S3C24XX
+        help
+          Samsung's S3C2416, S3C2443 and S3C2450 is an ARM9 based SoC
+          integrated with dual speed USB 2.0 device controller. It has
+          8 endpoints, as well as endpoint zero.
+
+          This driver has been tested on S3C2416 and S3C2450 processors.
+
+config USB_MV_UDC
+        tristate "Marvell USB2.0 Device Controller"
+        depends on HAS_DMA
+        help
+          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_MV_U3D
+        depends on HAS_DMA
+        tristate "MARVELL PXA2128 USB 3.0 controller"
+        help
+          MARVELL PXA2128 Processor series include a super speed USB3.0 device
+          controller, which support super speed USB peripheral.
+
+#
+# Controllers available in both integrated and discrete versions
+#
+
+config USB_M66592
+        tristate "Renesas M66592 USB Peripheral Controller"
+        help
+           M66592 is a discrete USB peripheral controller chip that
+           supports both full and high speed USB 2.0 data transfers.
+           It has seven configurable endpoints, and endpoint zero.
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "m66592_udc" and force all
+           gadget drivers to also be dynamically linked.
+
+#
+# Controllers available only in discrete form (and all PCI controllers)
+#
+
+config USB_AMD5536UDC
+        tristate "AMD5536 UDC"
+        depends on PCI
+        help
+           The AMD5536 UDC is part of the AMD Geode CS5536, an x86 southbridge.
+           It is a USB Highspeed DMA capable USB device controller. Beside ep0
+           it provides 4 IN and 4 OUT endpoints (bulk or interrupt type).
+           The UDC port supports OTG operation, and may be used as a host port
+           if it's not being used to implement peripheral or OTG roles.
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "amd5536udc" and force all
+           gadget drivers to also be dynamically linked.
+
+config USB_FSL_QE
+        tristate "Freescale QE/CPM USB Device Controller"
+        depends on FSL_SOC && (QUICC_ENGINE || CPM)
+        help
+           Some of Freescale PowerPC processors have a Full Speed
+           QE/CPM2 USB controller, which support device mode with 4
+           programmable endpoints. This driver supports the
+           controller in the MPC8360 and MPC8272, and should work with
+           controllers having QE or CPM2, given minor tweaks.
+
+           Set CONFIG_USB_GADGET to "m" to build this driver as a
+           dynamically linked module called "fsl_qe_udc".
+
+config USB_NET2272
+        tristate "PLX NET2272"
+        help
+          PLX NET2272 is a USB peripheral controller which supports
+          both full and high speed USB 2.0 data transfers.
+
+          It has three configurable endpoints, as well as endpoint zero
+          (for control transfer).
+          Say "y" to link the driver statically, or "m" to build a
+          dynamically linked module called "net2272" and force all
+          gadget drivers to also be dynamically linked.
+
+config USB_NET2272_DMA
+        boolean "Support external DMA controller"
+        depends on USB_NET2272 && HAS_DMA
+        help
+          The NET2272 part can optionally support an external DMA
+          controller, but your board has to have support in the
+          driver itself.
+
+          If unsure, say "N" here.  The driver works fine in PIO mode.
+
+config USB_NET2280
+        tristate "NetChip 228x / PLX USB338x"
+        depends on PCI
+        help
+           NetChip 2280 / 2282 is a PCI based USB peripheral controller which
+           supports both full and high speed USB 2.0 data transfers.
+
+           It has six configurable endpoints, as well as endpoint zero
+           (for control transfers) and several endpoints with dedicated
+           functions.
+
+           PLX 3380 / 3382 is a PCIe based USB peripheral controller which
+           supports full, high speed USB 2.0 and super speed USB 3.0
+           data transfers.
+
+           It has eight configurable endpoints, as well as endpoint zero
+           (for control transfers) and several endpoints with dedicated
+           functions.
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "net2280" and force all
+           gadget drivers to also be dynamically linked.
+
+config USB_GOKU
+        tristate "Toshiba TC86C001 'Goku-S'"
+        depends on PCI
+        help
+           The Toshiba TC86C001 is a PCI device which includes controllers
+           for full speed USB devices, IDE, I2C, SIO, plus a USB host (OHCI).
+
+           The device controller has three configurable (bulk or interrupt)
+           endpoints, plus endpoint zero (for control transfers).
+
+           Say "y" to link the driver statically, or "m" to build a
+           dynamically linked module called "goku_udc" and to force all
+           gadget drivers to also be dynamically linked.
+
+config USB_EG20T
+        tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"
+        depends on PCI
+        help
+          This is a USB device driver for EG20T PCH.
+          EG20T PCH is the platform controller hub that is used in Intel's
+          general embedded platform. EG20T PCH has USB device interface.
+          Using this interface, it is able to access system devices connected
+          to USB device.
+          This driver enables USB device function.
+          USB device is a USB peripheral controller which
+          supports both full and high speed USB 2.0 data transfers.
+          This driver supports both control transfer and bulk transfer modes.
+          This driver dose not support interrupt transfer or isochronous
+          transfer modes.
+
+          This driver also can be used for LAPIS Semiconductor's ML7213 which is
+          for IVI(In-Vehicle Infotainment) use.
+          ML7831 is for general purpose use.
+          ML7213/ML7831 is companion chip for Intel Atom E6xx series.
+          ML7213/ML7831 is completely compatible for Intel EG20T PCH.
+
+#
+# LAST -- dummy/emulated controller
+#
+
+config USB_DUMMY_HCD
+        tristate "Dummy HCD (DEVELOPMENT)"
+        depends on USB=y || (USB=m && USB_GADGET=m)
+        help
+          This host controller driver emulates USB, looping all data transfer
+          requests back to a USB "gadget driver" in the same host.  The host
+          side is the master; the gadget side is the slave.  Gadget drivers
+          can be high, full, or low speed; and they have access to endpoints
+          like those from NET2280, PXA2xx, or SA1100 hardware.
+
+          This may help in some stages of creating a driver to embed in a
+          Linux device, since it lets you debug several parts of the gadget
+          driver without its hardware or drivers being involved.
+
+          Since such a gadget side driver needs to interoperate with a host
+          side Linux-USB device driver, this may help to debug both sides
+          of a USB protocol stack.
+
+          Say "y" to link the driver statically, or "m" to build a
+          dynamically linked module called "dummy_hcd" and force all
+          gadget drivers to also be dynamically linked.
+
+# NOTE:  Please keep dummy_hcd LAST so that "real hardware" appears
+# first and will be selected by default.
+
+endmenu
diff --git a/drivers/usb/gadget/udc/Makefile b/drivers/usb/gadget/udc/Makefile
new file mode 100644
index 000000000000..4096122bb283
--- /dev/null
+++ b/drivers/usb/gadget/udc/Makefile
@@ -0,0 +1,31 @@
+#
+# USB peripheral controller drivers
+#
+obj-$(CONFIG_USB_GADGET)        += udc-core.o
+obj-$(CONFIG_USB_DUMMY_HCD)     += dummy_hcd.o
+obj-$(CONFIG_USB_NET2272)       += net2272.o
+obj-$(CONFIG_USB_NET2280)       += net2280.o
+obj-$(CONFIG_USB_AMD5536UDC)    += amd5536udc.o
+obj-$(CONFIG_USB_PXA25X)        += pxa25x_udc.o
+obj-$(CONFIG_USB_PXA27X)        += pxa27x_udc.o
+obj-$(CONFIG_USB_GOKU)          += goku_udc.o
+obj-$(CONFIG_USB_OMAP)          += omap_udc.o
+obj-$(CONFIG_USB_S3C2410)       += s3c2410_udc.o
+obj-$(CONFIG_USB_AT91)          += at91_udc.o
+obj-$(CONFIG_USB_ATMEL_USBA)    += atmel_usba_udc.o
+obj-$(CONFIG_USB_BCM63XX_UDC)   += bcm63xx_udc.o
+obj-$(CONFIG_USB_FSL_USB2)      += fsl_usb2_udc.o
+fsl_usb2_udc-y                  := fsl_udc_core.o
+fsl_usb2_udc-$(CONFIG_ARCH_MXC) += fsl_mxc_udc.o
+obj-$(CONFIG_USB_M66592)        += m66592-udc.o
+obj-$(CONFIG_USB_R8A66597)      += r8a66597-udc.o
+obj-$(CONFIG_USB_FSL_QE)        += fsl_qe_udc.o
+obj-$(CONFIG_USB_S3C_HSUDC)     += s3c-hsudc.o
+obj-$(CONFIG_USB_LPC32XX)       += lpc32xx_udc.o
+obj-$(CONFIG_USB_EG20T)         += pch_udc.o
+obj-$(CONFIG_USB_MV_UDC)        += mv_udc.o
+mv_udc-y                        := mv_udc_core.o
+obj-$(CONFIG_USB_FUSB300)       += fusb300_udc.o
+obj-$(CONFIG_USB_FOTG210_UDC)   += fotg210-udc.o
+obj-$(CONFIG_USB_MV_U3D)        += mv_u3d_core.o
+obj-$(CONFIG_USB_GR_UDC)        += gr_udc.o
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/udc/amd5536udc.c
index 41b062eb4de0..41b062eb4de0 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/udc/amd5536udc.c
diff --git a/drivers/usb/gadget/amd5536udc.h b/drivers/usb/gadget/udc/amd5536udc.h
index 6744d3b83109..6744d3b83109 100644
--- a/drivers/usb/gadget/amd5536udc.h
+++ b/drivers/usb/gadget/udc/amd5536udc.h
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/udc/at91_udc.c
index cfd18bcca723..cfd18bcca723 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/udc/at91_udc.c
diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/udc/at91_udc.h
index 017524663381..017524663381 100644
--- a/drivers/usb/gadget/at91_udc.h
+++ b/drivers/usb/gadget/udc/at91_udc.h
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 906e65f0e4fa..906e65f0e4fa 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
diff --git a/drivers/usb/gadget/atmel_usba_udc.h b/drivers/usb/gadget/udc/atmel_usba_udc.h
index a70706e8cb02..a70706e8cb02 100644
--- a/drivers/usb/gadget/atmel_usba_udc.h
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.h
diff --git a/drivers/usb/gadget/bcm63xx_udc.c b/drivers/usb/gadget/udc/bcm63xx_udc.c
index e969eb809a85..e969eb809a85 100644
--- a/drivers/usb/gadget/bcm63xx_udc.c
+++ b/drivers/usb/gadget/udc/bcm63xx_udc.c
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c
index 2b54955d3166..2b54955d3166 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/udc/dummy_hcd.c
diff --git a/drivers/usb/gadget/fotg210-udc.c b/drivers/usb/gadget/udc/fotg210-udc.c
index e143d69f6017..e143d69f6017 100644
--- a/drivers/usb/gadget/fotg210-udc.c
+++ b/drivers/usb/gadget/udc/fotg210-udc.c
diff --git a/drivers/usb/gadget/fotg210.h b/drivers/usb/gadget/udc/fotg210.h
index bbf991bcbe7c..bbf991bcbe7c 100644
--- a/drivers/usb/gadget/fotg210.h
+++ b/drivers/usb/gadget/udc/fotg210.h
diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/udc/fsl_mxc_udc.c
index 9b140fc4d3bc..9b140fc4d3bc 100644
--- a/drivers/usb/gadget/fsl_mxc_udc.c
+++ b/drivers/usb/gadget/udc/fsl_mxc_udc.c
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/udc/fsl_qe_udc.c
index 732430804841..732430804841 100644
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/udc/fsl_qe_udc.c
diff --git a/drivers/usb/gadget/fsl_qe_udc.h b/drivers/usb/gadget/udc/fsl_qe_udc.h
index 7026919fc901..7026919fc901 100644
--- a/drivers/usb/gadget/fsl_qe_udc.h
+++ b/drivers/usb/gadget/udc/fsl_qe_udc.h
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c
index 57944ee8ad90..57944ee8ad90 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/udc/fsl_udc_core.c
diff --git a/drivers/usb/gadget/fsl_usb2_udc.h b/drivers/usb/gadget/udc/fsl_usb2_udc.h
index c6703bb07b23..c6703bb07b23 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.h
+++ b/drivers/usb/gadget/udc/fsl_usb2_udc.h
diff --git a/drivers/usb/gadget/fusb300_udc.c b/drivers/usb/gadget/udc/fusb300_udc.c
index d40255f784df..d40255f784df 100644
--- a/drivers/usb/gadget/fusb300_udc.c
+++ b/drivers/usb/gadget/udc/fusb300_udc.c
diff --git a/drivers/usb/gadget/fusb300_udc.h b/drivers/usb/gadget/udc/fusb300_udc.h
index ae811d8d38b4..ae811d8d38b4 100644
--- a/drivers/usb/gadget/fusb300_udc.h
+++ b/drivers/usb/gadget/udc/fusb300_udc.h
diff --git a/drivers/usb/gadget/gadget_chips.h b/drivers/usb/gadget/udc/gadget_chips.h
index bcd04bc66b98..bcd04bc66b98 100644
--- a/drivers/usb/gadget/gadget_chips.h
+++ b/drivers/usb/gadget/udc/gadget_chips.h
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/udc/goku_udc.c
index 6c85839e15ad..6c85839e15ad 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/udc/goku_udc.c
diff --git a/drivers/usb/gadget/goku_udc.h b/drivers/usb/gadget/udc/goku_udc.h
index 86d2adafe149..86d2adafe149 100644
--- a/drivers/usb/gadget/goku_udc.h
+++ b/drivers/usb/gadget/udc/goku_udc.h
diff --git a/drivers/usb/gadget/gr_udc.c b/drivers/usb/gadget/udc/gr_udc.c
index 5d93f2b1e394..5d93f2b1e394 100644
--- a/drivers/usb/gadget/gr_udc.c
+++ b/drivers/usb/gadget/udc/gr_udc.c
diff --git a/drivers/usb/gadget/gr_udc.h b/drivers/usb/gadget/udc/gr_udc.h
index 8388897d9ec3..8388897d9ec3 100644
--- a/drivers/usb/gadget/gr_udc.h
+++ b/drivers/usb/gadget/udc/gr_udc.h
diff --git a/drivers/usb/gadget/lpc32xx_udc.c b/drivers/usb/gadget/udc/lpc32xx_udc.c
index 1629ad7dcb80..1629ad7dcb80 100644
--- a/drivers/usb/gadget/lpc32xx_udc.c
+++ b/drivers/usb/gadget/udc/lpc32xx_udc.c
diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/udc/m66592-udc.c
index de88d33b44b2..de88d33b44b2 100644
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/udc/m66592-udc.c
diff --git a/drivers/usb/gadget/m66592-udc.h b/drivers/usb/gadget/udc/m66592-udc.h
index 96d49d7bfb6b..96d49d7bfb6b 100644
--- a/drivers/usb/gadget/m66592-udc.h
+++ b/drivers/usb/gadget/udc/m66592-udc.h
diff --git a/drivers/usb/gadget/mv_u3d.h b/drivers/usb/gadget/udc/mv_u3d.h
index e32a787ac373..e32a787ac373 100644
--- a/drivers/usb/gadget/mv_u3d.h
+++ b/drivers/usb/gadget/udc/mv_u3d.h
diff --git a/drivers/usb/gadget/mv_u3d_core.c b/drivers/usb/gadget/udc/mv_u3d_core.c
index 16248711c152..16248711c152 100644
--- a/drivers/usb/gadget/mv_u3d_core.c
+++ b/drivers/usb/gadget/udc/mv_u3d_core.c
diff --git a/drivers/usb/gadget/mv_udc.h b/drivers/usb/gadget/udc/mv_udc.h
index be77f207dbaf..be77f207dbaf 100644
--- a/drivers/usb/gadget/mv_udc.h
+++ b/drivers/usb/gadget/udc/mv_udc.h
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c
index fcff3a571b45..fcff3a571b45 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/udc/mv_udc_core.c
diff --git a/drivers/usb/gadget/net2272.c b/drivers/usb/gadget/udc/net2272.c
index 059cfe527982..059cfe527982 100644
--- a/drivers/usb/gadget/net2272.c
+++ b/drivers/usb/gadget/udc/net2272.c
diff --git a/drivers/usb/gadget/net2272.h b/drivers/usb/gadget/udc/net2272.h
index e59505789359..e59505789359 100644
--- a/drivers/usb/gadget/net2272.h
+++ b/drivers/usb/gadget/udc/net2272.h
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/udc/net2280.c
index 248dccb3e542..248dccb3e542 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
diff --git a/drivers/usb/gadget/net2280.h b/drivers/usb/gadget/udc/net2280.h
index 03f15242d794..03f15242d794 100644
--- a/drivers/usb/gadget/net2280.h
+++ b/drivers/usb/gadget/udc/net2280.h
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c
index e731373fd4d7..e731373fd4d7 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/udc/omap_udc.c
diff --git a/drivers/usb/gadget/omap_udc.h b/drivers/usb/gadget/udc/omap_udc.h
index cfadeb5fc5de..cfadeb5fc5de 100644
--- a/drivers/usb/gadget/omap_udc.h
+++ b/drivers/usb/gadget/udc/omap_udc.h
diff --git a/drivers/usb/gadget/pch_udc.c b/drivers/usb/gadget/udc/pch_udc.c
index eb8c3bedb57a..eb8c3bedb57a 100644
--- a/drivers/usb/gadget/pch_udc.c
+++ b/drivers/usb/gadget/udc/pch_udc.c
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/udc/pxa25x_udc.c
index 251e4d5ee152..251e4d5ee152 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/udc/pxa25x_udc.c
diff --git a/drivers/usb/gadget/pxa25x_udc.h b/drivers/usb/gadget/udc/pxa25x_udc.h
index 3fe5931dc21a..3fe5931dc21a 100644
--- a/drivers/usb/gadget/pxa25x_udc.h
+++ b/drivers/usb/gadget/udc/pxa25x_udc.h
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c
index 597d39f89420..597d39f89420 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/udc/pxa27x_udc.c
diff --git a/drivers/usb/gadget/pxa27x_udc.h b/drivers/usb/gadget/udc/pxa27x_udc.h
index 28f2b53530f5..28f2b53530f5 100644
--- a/drivers/usb/gadget/pxa27x_udc.h
+++ b/drivers/usb/gadget/udc/pxa27x_udc.h
diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/udc/r8a66597-udc.c
index 46008421c1ec..46008421c1ec 100644
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/udc/r8a66597-udc.c
diff --git a/drivers/usb/gadget/r8a66597-udc.h b/drivers/usb/gadget/udc/r8a66597-udc.h
index 45c4b2df1785..45c4b2df1785 100644
--- a/drivers/usb/gadget/r8a66597-udc.h
+++ b/drivers/usb/gadget/udc/r8a66597-udc.h
diff --git a/drivers/usb/gadget/s3c-hsudc.c b/drivers/usb/gadget/udc/s3c-hsudc.c
index 10c6a128250c..10c6a128250c 100644
--- a/drivers/usb/gadget/s3c-hsudc.c
+++ b/drivers/usb/gadget/udc/s3c-hsudc.c
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/udc/s3c2410_udc.c
index 357b58e0087b..357b58e0087b 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/udc/s3c2410_udc.c
diff --git a/drivers/usb/gadget/s3c2410_udc.h b/drivers/usb/gadget/udc/s3c2410_udc.h
index 93bf225f1969..93bf225f1969 100644
--- a/drivers/usb/gadget/s3c2410_udc.h
+++ b/drivers/usb/gadget/udc/s3c2410_udc.h
diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index b0d98172bc07..b0d98172bc07 100644
--- a/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c