diff options
author | Guryanov Dmitry <guryanov@dgap.mipt.ru> | 2008-03-10 06:08:58 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-15 13:13:10 -0400 |
commit | a32bcc45b9e9d8021b5936c45dc3f8db7a044466 (patch) | |
tree | fd333440124e4d7892ce3d41645b3fe6e7e4e5ef /drivers | |
parent | e722409445fbe718f09f6d5e03d0ae84cf0954d0 (diff) |
Input: aiptek - add support for Genius G-PEN 560 tablet
USBHID driver only supports relative mode with this tablet so let aiptek
module handle it.
Signed-off-by: Dmitry Guryanov <guryanov@dgap.mipt.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hid/usbhid/hid-quirks.c | 4 | ||||
-rw-r--r-- | drivers/input/tablet/Kconfig | 10 | ||||
-rw-r--r-- | drivers/input/tablet/aiptek.c | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index e29a057cbea2..17b2f49675d8 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
@@ -405,6 +405,9 @@ | |||
405 | #define USB_VENDOR_ID_YEALINK 0x6993 | 405 | #define USB_VENDOR_ID_YEALINK 0x6993 |
406 | #define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K 0xb001 | 406 | #define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K 0xb001 |
407 | 407 | ||
408 | #define USB_VENDOR_ID_KYE 0x0458 | ||
409 | #define USB_DEVICE_ID_KYE_GPEN_560 0x5003 | ||
410 | |||
408 | /* | 411 | /* |
409 | * Alphabetically sorted blacklist by quirk type. | 412 | * Alphabetically sorted blacklist by quirk type. |
410 | */ | 413 | */ |
@@ -703,6 +706,7 @@ static const struct hid_blacklist { | |||
703 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_63, HID_QUIRK_IGNORE }, | 706 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_63, HID_QUIRK_IGNORE }, |
704 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_64, HID_QUIRK_IGNORE }, | 707 | { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_64, HID_QUIRK_IGNORE }, |
705 | { USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY, HID_QUIRK_IGNORE }, | 708 | { USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY, HID_QUIRK_IGNORE }, |
709 | { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560, HID_QUIRK_IGNORE }, | ||
706 | 710 | ||
707 | { 0, 0 } | 711 | { 0, 0 } |
708 | }; | 712 | }; |
diff --git a/drivers/input/tablet/Kconfig b/drivers/input/tablet/Kconfig index d371c0bdc0bd..effb49ea24aa 100644 --- a/drivers/input/tablet/Kconfig +++ b/drivers/input/tablet/Kconfig | |||
@@ -25,14 +25,14 @@ config TABLET_USB_ACECAD | |||
25 | module will be called acecad. | 25 | module will be called acecad. |
26 | 26 | ||
27 | config TABLET_USB_AIPTEK | 27 | config TABLET_USB_AIPTEK |
28 | tristate "Aiptek 6000U/8000U tablet support (USB)" | 28 | tristate "Aiptek 6000U/8000U and Genius G_PEN tablet support (USB)" |
29 | depends on USB_ARCH_HAS_HCD | 29 | depends on USB_ARCH_HAS_HCD |
30 | select USB | 30 | select USB |
31 | help | 31 | help |
32 | Say Y here if you want to use the USB version of the Aiptek 6000U | 32 | Say Y here if you want to use the USB version of the Aiptek 6000U, |
33 | or Aiptek 8000U tablet. Make sure to say Y to "Mouse support" | 33 | Aiptek 8000U or Genius G-PEN 560 tablet. Make sure to say Y to |
34 | (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support" | 34 | "Mouse support" (CONFIG_INPUT_MOUSEDEV) and/or "Event interface |
35 | (CONFIG_INPUT_EVDEV) as well. | 35 | support" (CONFIG_INPUT_EVDEV) as well. |
36 | 36 | ||
37 | To compile this driver as a module, choose M here: the | 37 | To compile this driver as a module, choose M here: the |
38 | module will be called aiptek. | 38 | module will be called aiptek. |
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c index 94683f58c9e1..1d759f6f8076 100644 --- a/drivers/input/tablet/aiptek.c +++ b/drivers/input/tablet/aiptek.c | |||
@@ -184,6 +184,7 @@ | |||
184 | */ | 184 | */ |
185 | 185 | ||
186 | #define USB_VENDOR_ID_AIPTEK 0x08ca | 186 | #define USB_VENDOR_ID_AIPTEK 0x08ca |
187 | #define USB_VENDOR_ID_KYE 0x0458 | ||
187 | #define USB_REQ_GET_REPORT 0x01 | 188 | #define USB_REQ_GET_REPORT 0x01 |
188 | #define USB_REQ_SET_REPORT 0x09 | 189 | #define USB_REQ_SET_REPORT 0x09 |
189 | 190 | ||
@@ -832,6 +833,7 @@ static const struct usb_device_id aiptek_ids[] = { | |||
832 | {USB_DEVICE(USB_VENDOR_ID_AIPTEK, 0x22)}, | 833 | {USB_DEVICE(USB_VENDOR_ID_AIPTEK, 0x22)}, |
833 | {USB_DEVICE(USB_VENDOR_ID_AIPTEK, 0x23)}, | 834 | {USB_DEVICE(USB_VENDOR_ID_AIPTEK, 0x23)}, |
834 | {USB_DEVICE(USB_VENDOR_ID_AIPTEK, 0x24)}, | 835 | {USB_DEVICE(USB_VENDOR_ID_AIPTEK, 0x24)}, |
836 | {USB_DEVICE(USB_VENDOR_ID_KYE, 0x5003)}, | ||
835 | {} | 837 | {} |
836 | }; | 838 | }; |
837 | 839 | ||