diff options
| author | Felipe Balbi <balbi@ti.com> | 2011-10-12 13:15:10 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2011-12-12 10:48:13 +0100 |
| commit | 67920bd7c984c7f3a73305ad11cbb9fd3d5e239c (patch) | |
| tree | f8400e00649f8d69884a1c2a9e436255597e9596 /drivers/usb/dwc3 | |
| parent | usb: dwc3: add xHCI Host support (diff) | |
| download | linux-67920bd7c984c7f3a73305ad11cbb9fd3d5e239c.tar.xz linux-67920bd7c984c7f3a73305ad11cbb9fd3d5e239c.zip | |
usb: dwc3: always compile gadget side too
We can decide in runtime if that will be used
or not.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/dwc3')
| -rw-r--r-- | drivers/usb/dwc3/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/dwc3/Makefile | 6 | ||||
| -rw-r--r-- | drivers/usb/dwc3/gadget.h | 10 |
3 files changed, 3 insertions, 15 deletions
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 2c05ec9cf352..dca0b51435e9 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -2,6 +2,8 @@ config USB_DWC3 tristate "DesignWare USB3 DRD Core Support" depends on (USB || USB_GADGET) select USB_OTG_UTILS + select USB_GADGET_DUALSPEED + select USB_GADGET_SUPERSPEED select USB_XHCI_PLATFORM help Say Y or M here if your system has a Dual Role SuperSpeed diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile index 0926e71142b9..900ae74357f1 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -5,11 +5,7 @@ obj-$(CONFIG_USB_DWC3) += dwc3.o dwc3-y := core.o dwc3-y += host.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 diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h index 71145a449d99..6dec6d94e547 100644 --- a/drivers/usb/dwc3/gadget.h +++ b/drivers/usb/dwc3/gadget.h @@ -110,18 +110,8 @@ static inline void dwc3_gadget_move_request_queued(struct dwc3_request *req) list_move_tail(&req->list, &dep->req_queued); } -#if defined(CONFIG_USB_GADGET_DWC3) || defined(CONFIG_USB_GADGET_DWC3_MODULE) int dwc3_gadget_init(struct dwc3 *dwc); void dwc3_gadget_exit(struct dwc3 *dwc); -#else -static inline int dwc3_gadget_init(struct dwc3 *dwc) { return 0; } -static inline void dwc3_gadget_exit(struct dwc3 *dwc) { } -static inline int dwc3_send_gadget_ep_cmd(struct dwc3 *dwc, unsigned ep, - unsigned cmd, struct dwc3_gadget_ep_cmd_params *params) -{ - return 0; -} -#endif void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req, int status); |