* [Patch v5] ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc [not found] <c28594f9-45a3-4232-82fc-2f7c65cfb30c@shmail0> @ 2012-09-26 20:20 ` Rene Buergel 2012-09-26 20:28 ` Greg KH 2012-09-26 21:27 ` Peter Stuge 0 siblings, 2 replies; 5+ messages in thread From: Rene Buergel @ 2012-09-26 20:20 UTC (permalink / raw) To: linux-kernel, linux-usb This patch - moves drivers/usb/serial/ezusb.c to drivers/usb/misc/ - renamed CONFIG_USB_EZUSB to CONFIG_USB_EZUSB_FX2 to avoid build errors - adapts Makefiles and Kconfigs switching from bool to tristate for CONFIG_USB_EZUSB_FX2 Signed-off-by: René Bürgel <rene.buergel@sohard.de> --- diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index 1bfcd02..bf7dc43 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig @@ -244,3 +244,8 @@ config USB_YUREX To compile this driver as a module, choose M here: the module will be called yurex. +config USB_EZUSB_FX2 + tristate "Functions for loading firmware on EZUSB chips" + help + Say Y here if you need EZUSB device support. + (Cypress FX/FX2/FX2LP microcontrollers) diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile index 796ce7e..f1f7815 100644 --- a/drivers/usb/misc/Makefile +++ b/drivers/usb/misc/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_USB_CYPRESS_CY7C63) += cypress_cy7c63.o obj-$(CONFIG_USB_CYTHERM) += cytherm.o obj-$(CONFIG_USB_EMI26) += emi26.o obj-$(CONFIG_USB_EMI62) += emi62.o +obj-$(CONFIG_USB_EZUSB_FX2) += ezusb.o obj-$(CONFIG_USB_FTDI_ELAN) += ftdi-elan.o obj-$(CONFIG_USB_IDMOUSE) += idmouse.o obj-$(CONFIG_USB_IOWARRIOR) += iowarrior.o diff --git a/drivers/usb/serial/ezusb.c b/drivers/usb/misc/ezusb.c similarity index 100% rename from drivers/usb/serial/ezusb.c rename to drivers/usb/misc/ezusb.c diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index f604f70..76f4622 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig @@ -42,11 +42,6 @@ config USB_SERIAL_CONSOLE If unsure, say N. -config USB_EZUSB - bool "Functions for loading firmware on EZUSB chips" - help - Say Y here if you need EZUSB device support. - config USB_SERIAL_GENERIC bool "USB Generic Serial Driver" help @@ -94,7 +89,7 @@ config USB_SERIAL_CH341 config USB_SERIAL_WHITEHEAT tristate "USB ConnectTech WhiteHEAT Serial Driver" - select USB_EZUSB + select USB_EZUSB_FX2 help Say Y here if you want to use a ConnectTech WhiteHEAT 4 port USB to serial converter device. @@ -281,7 +276,7 @@ config USB_SERIAL_IUU config USB_SERIAL_KEYSPAN_PDA tristate "USB Keyspan PDA Single Port Serial Driver" - select USB_EZUSB + select USB_EZUSB_FX2 help Say Y here if you want to use a Keyspan PDA single port USB to serial converter device. This driver makes use of firmware @@ -292,7 +287,7 @@ config USB_SERIAL_KEYSPAN_PDA config USB_SERIAL_KEYSPAN tristate "USB Keyspan USA-xxx Serial Driver" - select USB_EZUSB + select USB_EZUSB_FX2 ---help--- Say Y here if you want to use Keyspan USB to serial converter devices. This driver makes use of Keyspan's official firmware @@ -596,7 +591,7 @@ config USB_SERIAL_CYBERJACK config USB_SERIAL_XIRCOM tristate "USB Xircom / Entregra Single Port Serial Driver" - select USB_EZUSB + select USB_EZUSB_FX2 help Say Y here if you want to use a Xircom or Entregra single port USB to serial converter device. This driver makes use of firmware diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile index 45871f9..3b3e730 100644 --- a/drivers/usb/serial/Makefile +++ b/drivers/usb/serial/Makefile @@ -9,7 +9,6 @@ obj-$(CONFIG_USB_SERIAL) += usbserial.o usbserial-y := usb-serial.o generic.o bus.o usbserial-$(CONFIG_USB_SERIAL_CONSOLE) += console.o -usbserial-$(CONFIG_USB_EZUSB) += ezusb.o obj-$(CONFIG_USB_SERIAL_AIRCABLE) += aircable.o obj-$(CONFIG_USB_SERIAL_ARK3116) += ark3116.o ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Patch v5] ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc 2012-09-26 20:20 ` [Patch v5] ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc Rene Buergel @ 2012-09-26 20:28 ` Greg KH 2012-09-26 21:27 ` Peter Stuge 1 sibling, 0 replies; 5+ messages in thread From: Greg KH @ 2012-09-26 20:28 UTC (permalink / raw) To: Rene Buergel; +Cc: linux-kernel, linux-usb On Wed, Sep 26, 2012 at 10:20:19PM +0200, Rene Buergel wrote: > This patch > - moves drivers/usb/serial/ezusb.c to drivers/usb/misc/ > - renamed CONFIG_USB_EZUSB to CONFIG_USB_EZUSB_FX2 to avoid build errors Ah, does this solve the error I was seeing? Nice job figuring that one out. greg k-h ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Patch v5] ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc 2012-09-26 20:20 ` [Patch v5] ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc Rene Buergel 2012-09-26 20:28 ` Greg KH @ 2012-09-26 21:27 ` Peter Stuge 2012-09-26 22:08 ` Greg KH 2012-09-26 22:36 ` Rene Buergel 1 sibling, 2 replies; 5+ messages in thread From: Peter Stuge @ 2012-09-26 21:27 UTC (permalink / raw) To: Rene Buergel; +Cc: linux-kernel, linux-usb Rene Buergel wrote: > - renamed CONFIG_USB_EZUSB to CONFIG_USB_EZUSB_FX2 to avoid build errors Is this really the reason for the build error? I doubt it. Also, does the code in fact support only FX2, neither older chips nor newer FX3? > diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig > index 1bfcd02..bf7dc43 100644 > --- a/drivers/usb/misc/Kconfig > +++ b/drivers/usb/misc/Kconfig > @@ -244,3 +244,8 @@ config USB_YUREX > To compile this driver as a module, choose M here: the > module will be called yurex. > > +config USB_EZUSB_FX2 > + tristate "Functions for loading firmware on EZUSB chips" If only FX2 then I suggest mentioning that also in the immediately user-visible option description, not only in the help. > + help > + Say Y here if you need EZUSB device support. > + (Cypress FX/FX2/FX2LP microcontrollers) If FX is also supported then perhaps still rename the option, although I think renaming is unrelated to the build problems. I think it makes sense to call the option after the "highest" supported chip. //Peter ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Patch v5] ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc 2012-09-26 21:27 ` Peter Stuge @ 2012-09-26 22:08 ` Greg KH 2012-09-26 22:36 ` Rene Buergel 1 sibling, 0 replies; 5+ messages in thread From: Greg KH @ 2012-09-26 22:08 UTC (permalink / raw) To: Rene Buergel, linux-kernel, linux-usb On Wed, Sep 26, 2012 at 11:27:10PM +0200, Peter Stuge wrote: > Rene Buergel wrote: > > - renamed CONFIG_USB_EZUSB to CONFIG_USB_EZUSB_FX2 to avoid build errors > > Is this really the reason for the build error? I doubt it. It is, try it without it, the Makefiles get confused :( thanks, greg k-h ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Patch v5] ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc 2012-09-26 21:27 ` Peter Stuge 2012-09-26 22:08 ` Greg KH @ 2012-09-26 22:36 ` Rene Buergel 1 sibling, 0 replies; 5+ messages in thread From: Rene Buergel @ 2012-09-26 22:36 UTC (permalink / raw) To: linux-kernel, linux-usb > Also, does the code in fact support only FX2, neither older chips nor > newer FX3? It also does support the FX(1), but not FX3. At first sight, it looks like FX3 got another register interface. > If FX is also supported then perhaps still rename the option, > although I think renaming is unrelated to the build problems. > > I think it makes sense to call the option after the "highest" > supported chip. That's what it is. ;) I would be happy to re-rename this option to USB_EZUSB somewhere in the future, but i think it is the best option to stick with this for at least one major version to avoid build errors. > > > //Peter > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-09-26 22:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <c28594f9-45a3-4232-82fc-2f7c65cfb30c@shmail0>
2012-09-26 20:20 ` [Patch v5] ezusb: move ezusb.c from drivers/usb/serial to drivers/usb/misc Rene Buergel
2012-09-26 20:28 ` Greg KH
2012-09-26 21:27 ` Peter Stuge
2012-09-26 22:08 ` Greg KH
2012-09-26 22:36 ` Rene Buergel
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.