usb: dwc3: add USB_DWC3_MSM peripheral controller choice.
We distinguish between the DWC3 generic modules, compiled
depends on USB_DWC3, to the vendor specific glue layers
as dwc3-msm.c or dwc3-omap.c complied by DWC3_MSM or DWC3_OMAP
configs. These configs automatically selects the USB_DWC3.
The USB_DWC3_MSM will be used in next commits for specific
needs of the dwc3 on MSM architecture.
Also removed USB_GADGET_DWC3 from Kconfig in order to organize
as in latest Linux kernel. This is done since the dwc3/gadget
is compiled anyway (as long as with the future dwc3/host) and only
on runtime (reading HWPARAMS) the dwc3/core decides if to load the
gadget (or the host).
Change-Id: Ifc2ebb1c9a6cfd59cd004aee5b528ba2bb364627
Signed-off-by: Ido Shayevitz <idos@codeaurora.org>
diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile
index 593d1db..5607ac4 100644
--- a/drivers/usb/dwc3/Makefile
+++ b/drivers/usb/dwc3/Makefile
@@ -4,10 +4,7 @@
obj-$(CONFIG_USB_DWC3) += dwc3.o
dwc3-y := core.o
-
-ifneq ($(CONFIG_USB_GADGET_DWC3),)
- dwc3-y += gadget.o ep0.o
-endif
+dwc3-y += gadget.o ep0.o
ifneq ($(CONFIG_DEBUG_FS),)
dwc3-y += debugfs.o
@@ -28,7 +25,7 @@
# PCI doesn't provide nops if CONFIG_PCI isn't enabled.
##
-obj-$(CONFIG_USB_DWC3) += dwc3-omap.o
+obj-$(CONFIG_USB_DWC3_OMAP) += dwc3-omap.o
ifneq ($(CONFIG_PCI),)
obj-$(CONFIG_USB_DWC3) += dwc3-pci.o
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h
index 71145a4..9206096 100644
--- a/drivers/usb/dwc3/gadget.h
+++ b/drivers/usb/dwc3/gadget.h
@@ -110,7 +110,7 @@
list_move_tail(&req->list, &dep->req_queued);
}
-#if defined(CONFIG_USB_GADGET_DWC3) || defined(CONFIG_USB_GADGET_DWC3_MODULE)
+#if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_DWC3_MODULE)
int dwc3_gadget_init(struct dwc3 *dwc);
void dwc3_gadget_exit(struct dwc3 *dwc);
#else