usb: dwc2/s3c-hsotg: move s3c-hsotg into dwc2 directory

Moves the s3c-hsotg driver into the dwc2 directory and uses the
dwc2 defines in hw.h. Renames s3c-hsotg.c to gadget.c.

NOTE: You can build both host and peripheral as a dynamically
linked module, but be aware that if you insmod dwc2_gadget, then
rmmod it, then insmod dwc2 and dwc2_platform for host mode, this
will not work. As the step to rmmod dwc2_gadget.ko will turn off
the clock to the USB IP. The dwc2 host driver currently does not
look to turn on a clock yet. A patch to fix that will be coming
soon.

Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
[ jh,rb - For gadget part only: ]
Tested-by: Jingoo Han <jg1.han@samsung.com>
Tested-by: Robert Baldyga <r.baldyga@samsung.com>
[ pz: Folded Kconfig/Makefile changes, which were originally in
  a separate patch, into this one, to avoid a build breakage.
  Modified Kconfig/Makefile changes a bit. Tested host part only. ]
Signed-off-by: Paul Zimmerman <paulz@synopsys.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 47 insertions, 14 deletions

diff --git a/drivers/usb/dwc2/Kconfig b/drivers/usb/dwc2/Kconfig
index be947d673844..f93807b3631a 100644
--- a/drivers/usb/dwc2/Kconfig
+++ b/drivers/usb/dwc2/Kconfig
@@ -1,25 +1,58 @@
 config USB_DWC2
-        tristate "DesignWare USB2 DRD Core Support"
+        bool "DesignWare USB2 DRD Core Support"
         depends on USB
         help
-          Say Y or M here if your system has a Dual Role HighSpeed
-          USB controller based on the DesignWare HSOTG IP Core.
+          Say Y here if your system has a Dual Role Hi-Speed USB
+          controller based on the DesignWare HSOTG IP Core.
 
-          If you choose to build this driver as dynamically linked
-          modules, the core module will be called dwc2.ko, the
-          PCI bus interface module (if you have a PCI bus system)
-          will be called dwc2_pci.ko and the platform interface module
-          (for controllers directly connected to the CPU) will be called
-          dwc2_platform.ko.
+          For host mode, if you choose to build the driver as dynamically
+          linked modules, the core module will be called dwc2.ko, the PCI
+          bus interface module (if you have a PCI bus system) will be
+          called dwc2_pci.ko, and the platform interface module (for
+          controllers directly connected to the CPU) will be called
+          dwc2_platform.ko. For gadget mode, there will be a single
+          module called dwc2_gadget.ko.
 
-          NOTE: This driver at present only implements the Host mode
-          of the controller. The existing s3c-hsotg driver supports
-          Peripheral mode, but only for the Samsung S3C platforms.
-          There are plans to merge the s3c-hsotg driver with this
-          driver in the near future to create a dual-role driver.
+          NOTE: The s3c-hsotg driver is now renamed to dwc2_gadget. The
+          host and gadget drivers are still currently separate drivers.
+          There are plans to merge the dwc2_gadget driver with the dwc2
+          host driver in the near future to create a dual-role driver.
 
 if USB_DWC2
 
+config USB_DWC2_HOST
+        tristate "Host only mode"
+        depends on USB
+        help
+          The Designware USB2.0 high-speed host controller
+          integrated into many SoCs.
+
+config USB_DWC2_PLATFORM
+        bool "DWC2 Platform"
+        depends on USB_DWC2_HOST
+        default USB_DWC2_HOST
+        help
+          The Designware USB2.0 platform interface module for
+          controllers directly connected to the CPU. This is only
+          used for host mode.
+
+config USB_DWC2_PCI
+        bool "DWC2 PCI"
+        depends on USB_DWC2_HOST && PCI
+        default USB_DWC2_HOST
+        help
+          The Designware USB2.0 PCI interface module for controllers
+          connected to a PCI bus. This is only used for host mode.
+
+comment "Gadget mode requires USB Gadget support to be enabled"
+
+config USB_DWC2_PERIPHERAL
+        tristate "Gadget only mode"
+        depends on USB_GADGET
+        help
+          The Designware USB2.0 high-speed gadget controller
+          integrated into many SoCs.
+
 config USB_DWC2_DEBUG
         bool "Enable Debugging Messages"
         help