From ba0acb5ee318901646f82c134cca2e4de0c43934 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Mon, 7 May 2007 17:31:32 -0400 Subject: [PATCH] Input: move USB miscellaneous devices under drivers/input/misc This will allow concentrating all input devices in one place in {menu|x|q}config. Signed-off-by: Dmitry Torokhov Acked-by: Greg Kroah-Hartman --- drivers/input/misc/Kconfig | 88 +++++++++++++++++-- drivers/input/misc/Makefile | 9 +- .../{usb/input => input/misc}/ati_remote.c | 0 .../{usb/input => input/misc}/ati_remote2.c | 0 .../input => input/misc}/keyspan_remote.c | 0 .../input => input/misc}/map_to_7segment.h | 0 drivers/{usb/input => input/misc}/powermate.c | 0 drivers/{usb/input => input/misc}/yealink.c | 2 +- drivers/{usb/input => input/misc}/yealink.h | 0 drivers/usb/Kconfig | 2 - drivers/usb/Makefile | 3 - drivers/usb/input/Kconfig | 77 ---------------- drivers/usb/input/Makefile | 13 --- 13 files changed, 89 insertions(+), 105 deletions(-) rename drivers/{usb/input => input/misc}/ati_remote.c (100%) rename drivers/{usb/input => input/misc}/ati_remote2.c (100%) rename drivers/{usb/input => input/misc}/keyspan_remote.c (100%) rename drivers/{usb/input => input/misc}/map_to_7segment.h (100%) rename drivers/{usb/input => input/misc}/powermate.c (100%) rename drivers/{usb/input => input/misc}/yealink.c (99%) rename drivers/{usb/input => input/misc}/yealink.h (100%) delete mode 100644 drivers/usb/input/Kconfig delete mode 100644 drivers/usb/input/Makefile diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 1d0d3e765db6..6013ace94d98 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -40,6 +40,18 @@ config INPUT_M68K_BEEP tristate "M68k Beeper support" depends on M68K +config INPUT_IXP4XX_BEEPER + tristate "IXP4XX Beeper support" + depends on ARCH_IXP4XX + help + If you say yes here, you can connect a beeper to the + ixp4xx gpio pins. This is used by the LinkSys NSLU2. + + If unsure, say Y. + + To compile this driver as a module, choose M here: the + module will be called ixp4xx-beeper. + config INPUT_COBALT_BTNS tristate "Cobalt button interface" depends on MIPS_COBALT @@ -70,17 +82,79 @@ config INPUT_ATLAS_BTNS To compile this driver as a module, choose M here: the module will be called atlas_btns. -config INPUT_IXP4XX_BEEPER - tristate "IXP4XX Beeper support" - depends on ARCH_IXP4XX +config INPUT_ATI_REMOTE + tristate "ATI / X10 USB RF remote control" + select USB help - If you say yes here, you can connect a beeper to the - ixp4xx gpio pins. This is used by the LinkSys NSLU2. + Say Y here if you want to use an ATI or X10 "Lola" USB remote control. + These are RF remotes with USB receivers. + The ATI remote comes with many of ATI's All-In-Wonder video cards. + The X10 "Lola" remote is available at: + + This driver provides mouse pointer, left and right mouse buttons, + and maps all the other remote buttons to keypress events. - If unsure, say Y. + To compile this driver as a module, choose M here: the module will be + called ati_remote. + +config INPUT_ATI_REMOTE2 + tristate "ATI / Philips USB RF remote control" + select USB + help + Say Y here if you want to use an ATI or Philips USB RF remote control. + These are RF remotes with USB receivers. + ATI Remote Wonder II comes with some ATI's All-In-Wonder video cards + and is also available as a separate product. + This driver provides mouse pointer, left and right mouse buttons, + and maps all the other remote buttons to keypress events. + + To compile this driver as a module, choose M here: the module will be + called ati_remote2. + +config INPUT_KEYSPAN_REMOTE + tristate "Keyspan DMR USB remote control (EXPERIMENTAL)" + depends on EXPERIMENTAL + select USB + help + Say Y here if you want to use a Keyspan DMR USB remote control. + Currently only the UIA-11 type of receiver has been tested. The tag + on the receiver that connects to the USB port should have a P/N that + will tell you what type of DMR you have. The UIA-10 type is not + supported at this time. This driver maps all buttons to keypress + events. + + To compile this driver as a module, choose M here: the module will + be called keyspan_remote. + +config INPUT_POWERMATE + tristate "Griffin PowerMate and Contour Jog support" + select USB + help + Say Y here if you want to use Griffin PowerMate or Contour Jog devices. + These are aluminum dials which can measure clockwise and anticlockwise + rotation. The dial also acts as a pushbutton. The base contains an LED + which can be instructed to pulse or to switch to a particular intensity. + + You can download userspace tools from + . To compile this driver as a module, choose M here: the - module will be called ixp4xx-beeper. + module will be called powermate. + +config INPUT_YEALINK + tristate "Yealink usb-p1k voip phone" + depends EXPERIMENTAL + select USB + help + Say Y here if you want to enable keyboard and LCD functions of the + Yealink usb-p1k usb phones. The audio part is enabled by the generic + usb sound driver, so you might want to enable that as well. + + For information about how to use these additional functions, see + . + + To compile this driver as a module, choose M here: the module will be + called yealink. config INPUT_UINPUT tristate "User level driver support" diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile index 21e3cca0d33e..8b2f7799e25c 100644 --- a/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile @@ -8,9 +8,14 @@ obj-$(CONFIG_INPUT_POLLDEV) += input-polldev.o obj-$(CONFIG_INPUT_SPARCSPKR) += sparcspkr.o obj-$(CONFIG_INPUT_PCSPKR) += pcspkr.o obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o -obj-$(CONFIG_INPUT_UINPUT) += uinput.o +obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o obj-$(CONFIG_INPUT_COBALT_BTNS) += cobalt_btns.o obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o obj-$(CONFIG_INPUT_ATLAS_BTNS) += atlas_btns.o +obj-$(CONFIG_INPUT_ATI_REMOTE) += ati_remote.o +obj-$(CONFIG_INPUT_ATI_REMOTE2) += ati_remote2.o +obj-$(CONFIG_INPUT_KEYSPAN_REMOTE) += keyspan_remote.o +obj-$(CONFIG_INPUT_POWERMATE) += powermate.o +obj-$(CONFIG_INPUT_YEALINK) += yealink.o obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o -obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o +obj-$(CONFIG_INPUT_UINPUT) += uinput.o diff --git a/drivers/usb/input/ati_remote.c b/drivers/input/misc/ati_remote.c similarity index 100% rename from drivers/usb/input/ati_remote.c rename to drivers/input/misc/ati_remote.c diff --git a/drivers/usb/input/ati_remote2.c b/drivers/input/misc/ati_remote2.c similarity index 100% rename from drivers/usb/input/ati_remote2.c rename to drivers/input/misc/ati_remote2.c diff --git a/drivers/usb/input/keyspan_remote.c b/drivers/input/misc/keyspan_remote.c similarity index 100% rename from drivers/usb/input/keyspan_remote.c rename to drivers/input/misc/keyspan_remote.c diff --git a/drivers/usb/input/map_to_7segment.h b/drivers/input/misc/map_to_7segment.h similarity index 100% rename from drivers/usb/input/map_to_7segment.h rename to drivers/input/misc/map_to_7segment.h diff --git a/drivers/usb/input/powermate.c b/drivers/input/misc/powermate.c similarity index 100% rename from drivers/usb/input/powermate.c rename to drivers/input/misc/powermate.c diff --git a/drivers/usb/input/yealink.c b/drivers/input/misc/yealink.c similarity index 99% rename from drivers/usb/input/yealink.c rename to drivers/input/misc/yealink.c index fc645b299189..ab15880fd566 100644 --- a/drivers/usb/input/yealink.c +++ b/drivers/input/misc/yealink.c @@ -29,7 +29,7 @@ * This driver is based on: * - the usbb2k-api http://savannah.nongnu.org/projects/usbb2k-api/ * - information from http://memeteau.free.fr/usbb2k - * - the xpad-driver drivers/usb/input/xpad.c + * - the xpad-driver drivers/input/joystick/xpad.c * * Thanks to: * - Olivier Vandorpe, for providing the usbb2k-api. diff --git a/drivers/usb/input/yealink.h b/drivers/input/misc/yealink.h similarity index 100% rename from drivers/usb/input/yealink.h rename to drivers/input/misc/yealink.h diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 9980a4ddfed9..b847bbc8b0e1 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -85,8 +85,6 @@ source "drivers/usb/class/Kconfig" source "drivers/usb/storage/Kconfig" -source "drivers/usb/input/Kconfig" - source "drivers/usb/image/Kconfig" source "drivers/usb/net/Kconfig" diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 7059a64637a8..0ef090b1b37c 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -23,9 +23,6 @@ obj-$(CONFIG_USB_PRINTER) += class/ obj-$(CONFIG_USB_STORAGE) += storage/ obj-$(CONFIG_USB) += storage/ -obj-$(CONFIG_USB_ATI_REMOTE) += input/ -obj-$(CONFIG_USB_POWERMATE) += input/ - obj-$(CONFIG_USB_CATC) += net/ obj-$(CONFIG_USB_KAWETH) += net/ obj-$(CONFIG_USB_PEGASUS) += net/ diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig deleted file mode 100644 index 4959dcf3cb4d..000000000000 --- a/drivers/usb/input/Kconfig +++ /dev/null @@ -1,77 +0,0 @@ -# -# USB Input driver configuration -# -comment "USB Input Devices" - depends on USB - -config USB_POWERMATE - tristate "Griffin PowerMate and Contour Jog support" - depends on USB && INPUT - ---help--- - Say Y here if you want to use Griffin PowerMate or Contour Jog devices. - These are aluminum dials which can measure clockwise and anticlockwise - rotation. The dial also acts as a pushbutton. The base contains an LED - which can be instructed to pulse or to switch to a particular intensity. - - You can download userspace tools from - . - - To compile this driver as a module, choose M here: the - module will be called powermate. - -config USB_YEALINK - tristate "Yealink usb-p1k voip phone" - depends on USB && INPUT && EXPERIMENTAL - ---help--- - Say Y here if you want to enable keyboard and LCD functions of the - Yealink usb-p1k usb phones. The audio part is enabled by the generic - usb sound driver, so you might want to enable that as well. - - For information about how to use these additional functions, see - . - - To compile this driver as a module, choose M here: the module will be - called yealink. - -config USB_ATI_REMOTE - tristate "ATI / X10 USB RF remote control" - depends on USB && INPUT - ---help--- - Say Y here if you want to use an ATI or X10 "Lola" USB remote control. - These are RF remotes with USB receivers. - The ATI remote comes with many of ATI's All-In-Wonder video cards. - The X10 "Lola" remote is available at: - - This driver provides mouse pointer, left and right mouse buttons, - and maps all the other remote buttons to keypress events. - - To compile this driver as a module, choose M here: the module will be - called ati_remote. - -config USB_ATI_REMOTE2 - tristate "ATI / Philips USB RF remote control" - depends on USB && INPUT - ---help--- - Say Y here if you want to use an ATI or Philips USB RF remote control. - These are RF remotes with USB receivers. - ATI Remote Wonder II comes with some ATI's All-In-Wonder video cards - and is also available as a separate product. - This driver provides mouse pointer, left and right mouse buttons, - and maps all the other remote buttons to keypress events. - - To compile this driver as a module, choose M here: the module will be - called ati_remote2. - -config USB_KEYSPAN_REMOTE - tristate "Keyspan DMR USB remote control (EXPERIMENTAL)" - depends on USB && INPUT && EXPERIMENTAL - ---help--- - Say Y here if you want to use a Keyspan DMR USB remote control. - Currently only the UIA-11 type of receiver has been tested. The tag - on the receiver that connects to the USB port should have a P/N that - will tell you what type of DMR you have. The UIA-10 type is not - supported at this time. This driver maps all buttons to keypress - events. - - To compile this driver as a module, choose M here: the module will - be called keyspan_remote. diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile deleted file mode 100644 index 91df130909e6..000000000000 --- a/drivers/usb/input/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# -# Makefile for the USB input drivers -# - -obj-$(CONFIG_USB_ATI_REMOTE) += ati_remote.o -obj-$(CONFIG_USB_ATI_REMOTE2) += ati_remote2.o -obj-$(CONFIG_USB_KEYSPAN_REMOTE) += keyspan_remote.o -obj-$(CONFIG_USB_POWERMATE) += powermate.o -obj-$(CONFIG_USB_YEALINK) += yealink.o - -ifeq ($(CONFIG_USB_DEBUG),y) -EXTRA_CFLAGS += -DDEBUG -endif