On Mon, Mar 03, 2014 at 09:06:14PM -0600, [email protected] wrote: > From: Dinh Nguyen <[email protected]> > > Moves the s3c-hsotg driver into the dwc2 folder and use the dwc2 defines in > hw.h. The s3c-hostg driver will now be built with a kconfig option under > the dwc2 kconfig. USB_DWC2_HOST and USB_S3C_HSOTG are mutually exclusive > build options. > > Signed-off-by: Dinh Nguyen <[email protected]> > Cc: Greg Kroah-Hartman <[email protected]> > Cc: Paul Zimmerman <[email protected]> > Cc: Felipe Balbi <[email protected]> > Cc: Ben Dooks <[email protected]> > Cc: Matt Porter <[email protected]> > Cc: Kukjin Kim <[email protected]> > Cc: Stephen Warren <[email protected]> > Cc: Matthijs Kooijman <[email protected]> > Cc: Jingoo Han <[email protected]> > Cc: Sachin Kamat <[email protected]> > Cc: Robert Baldyga <[email protected]> > --- > v2: > - Fix whitespace damage > - Redo s3c_hsotg_handle_rx() to use dwc2 definitions > - Use FIFOSIZE_DEPTH_GET > --- > drivers/usb/dwc2/Kconfig | 15 ++ > drivers/usb/dwc2/Makefile | 15 +- > drivers/usb/{gadget => dwc2}/s3c-hsotg.c | 415 > +++++++++++++++--------------- > drivers/usb/gadget/Kconfig | 7 - > drivers/usb/gadget/Makefile | 1 - > drivers/usb/gadget/s3c-hsotg.h | 378 --------------------------- > 6 files changed, 231 insertions(+), 600 deletions(-) > rename drivers/usb/{gadget => dwc2}/s3c-hsotg.c (91%) > delete mode 100644 drivers/usb/gadget/s3c-hsotg.h > > diff --git a/drivers/usb/dwc2/Kconfig b/drivers/usb/dwc2/Kconfig > index be947d6..ce14859 100644 > --- a/drivers/usb/dwc2/Kconfig > +++ b/drivers/usb/dwc2/Kconfig > @@ -20,6 +20,21 @@ config USB_DWC2 > > if USB_DWC2 > > +config USB_DWC2_HOST > + bool "Host only mode" > + depends on USB=y || USB=USB_DWC2 > + default y > + help > + Select this when you want to use DWC2 in host mode only, > + thereby the gadget feature will be regressed. > + > +config USB_S3C_HSOTG
as I mentioned before, this should be USB_DWC2_GADGET or USB_DWC2_PERIPHERAL > + depends on (ARM || USB_GADGET=y) && !USB_DWC2_HOST > + tristate "Designware/S3C HS/OtG USB Device controller" > + help > + The Designware USB2.0 high-speed gadget controller > + integrated into many SoCs. > + > config USB_DWC2_DEBUG > bool "Enable Debugging Messages" > help > diff --git a/drivers/usb/dwc2/Makefile b/drivers/usb/dwc2/Makefile > index 11529d3..2778e16 100644 > --- a/drivers/usb/dwc2/Makefile > +++ b/drivers/usb/dwc2/Makefile > @@ -1,9 +1,15 @@ > ccflags-$(CONFIG_USB_DWC2_DEBUG) += -DDEBUG > ccflags-$(CONFIG_USB_DWC2_VERBOSE) += -DVERBOSE_DEBUG > > +ifeq ($(CONFIG_USB_DWC2_HOST),y) > obj-$(CONFIG_USB_DWC2) += dwc2.o > - > dwc2-y += core.o core_intr.o > +dwc2-y += hcd.o hcd_intr.o > +dwc2-y += hcd_queue.o hcd_ddma.o > +endif > +obj-$(CONFIG_USB_S3C_HSOTG) += s3c_hsotg.o > +s3c_hsotg-y += s3c-hsotg.o wrong. > + > > # NOTE: This driver at present only implements the Host mode > # of the controller. The existing s3c-hsotg driver supports > @@ -13,13 +19,12 @@ dwc2-y += core.o > core_intr.o > # that is done, Host mode will become an optional feature that > # is selected with a config option. > > -dwc2-y += hcd.o hcd_intr.o > -dwc2-y += hcd_queue.o hcd_ddma.o > - > ifneq ($(CONFIG_PCI),) > obj-$(CONFIG_USB_DWC2) += dwc2_pci.o > endif > -obj-$(CONFIG_USB_DWC2) += dwc2_platform.o > +ifneq ($(CONFIG_USB_DWC2_HOST),) > + obj-$(CONFIG_USB_DWC2) += dwc2_platform.o > +endif wrong. Anyway, I'll stop, you completely ignored all my comments from previous series. NAK -- balbi
signature.asc
Description: Digital signature
