Merge branch 'upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 20 Mar 2012 12:18:05 +0000 (13:18 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 20 Mar 2012 12:18:05 +0000 (13:18 +0100)
Conflicts:
drivers/hid/Makefile

1  2 
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-multitouch.c
drivers/hid/hid-wacom.c
drivers/hid/usbhid/hid-quirks.c

diff --combined drivers/hid/Kconfig
index 3890ac698061cfd70534ebc499d27ece77d4475f,3d14e4f6bac10df5a2e5902dede68ebfc7abd603..a3d033252995aeb388fbcabc1dab8a286e38cb51
@@@ -200,11 -200,14 +200,14 @@@ config HID_KEYTOUC
                - Keytouch IEC 60945
  
  config HID_KYE
-       tristate "Kye/Genius Ergo Mouse" if EXPERT
+       tristate "KYE/Genius devices"
        depends on USB_HID
-       default !EXPERT
        ---help---
-       Support for Kye/Genius Ergo Mouse.
+       Support for KYE/Genius devices not fully compliant with HID standard:
+       - Ergo Mouse
+       - EasyPen i405X tablet
+       - MousePen i608X tablet
+       - EasyPen M610X tablet
  
  config HID_UCLOGIC
        tristate "UC-Logic"
@@@ -257,7 -260,9 +260,9 @@@ config HID_LOGITECH_D
        ---help---
        Say Y if you want support for Logitech Unifying receivers and devices.
        Unifying receivers are capable of pairing up to 6 Logitech compliant
-       devices to the same receiver.
+       devices to the same receiver. Without this driver it will be handled by
+       generic USB_HID driver and all incomming events will be multiplexed
+       into a single mouse and a single keyboard device.
  
  config LOGITECH_FF
        bool "Logitech force feedback support"
@@@ -354,9 -359,7 +359,9 @@@ config HID_MULTITOUC
          - LG Display panels (Dell ST2220Tc)
          - Lumio CrystalTouch panels
          - MosArt dual-touch panels
 +        - Panasonic multitouch panels
          - PenMount dual touch panels
 +        - Perixx Peripad 701 touchpad
          - PixArt optical touch screen
          - Pixcir dual touch panels
          - Quanta panels
@@@ -478,13 -481,69 +483,22 @@@ config HID_PRIMA
        HID standard.
  
  config HID_ROCCAT
 -      tristate "Roccat special event support"
 +      tristate "Roccat device support"
        depends on USB_HID
 -      select HID_ROCCAT_COMMON
        ---help---
 -      Support for Roccat special events.
 -      Say Y here if you have a Roccat mouse or keyboard and want OSD or
 -      macro execution support.
 -
 -config HID_ROCCAT_COMMON
 -      tristate
 -      depends on HID_ROCCAT
 -
 -config HID_ROCCAT_ARVO
 -      tristate "Roccat Arvo keyboard support"
 -      depends on USB_HID
 -      depends on HID_ROCCAT
 -      ---help---
 -      Support for Roccat Arvo keyboard.
 -
 -config HID_ROCCAT_ISKU
 -      tristate "Roccat Isku keyboard support"
 -      depends on USB_HID
 -      depends on HID_ROCCAT
 -      ---help---
 -      Support for Roccat Isku keyboard.
 -
 -config HID_ROCCAT_KONE
 -      tristate "Roccat Kone Mouse support"
 -      depends on USB_HID
 -      depends on HID_ROCCAT
 -      ---help---
 -      Support for Roccat Kone mouse.
 -
 -config HID_ROCCAT_KONEPLUS
 -      tristate "Roccat Kone[+] mouse support"
 -      depends on USB_HID
 -      depends on HID_ROCCAT
 -      ---help---
 -      Support for Roccat Kone[+] mouse.
 -
 -config HID_ROCCAT_KOVAPLUS
 -      tristate "Roccat Kova[+] mouse support"
 -      depends on USB_HID
 -      depends on HID_ROCCAT
 -      ---help---
 -      Support for Roccat Kova[+] mouse.
 -
 -config HID_ROCCAT_PYRA
 -      tristate "Roccat Pyra mouse support"
 -      depends on USB_HID
 -      depends on HID_ROCCAT
 -      ---help---
 -      Support for Roccat Pyra mouse.
 +      Support for Roccat devices.
 +      Say Y here if you have a Roccat mouse or keyboard and want
 +      support for its special functionalities.
  
+ config HID_SAITEK
+       tristate "Saitek non-fully HID-compliant devices"
+       depends on USB_HID
+       ---help---
+       Support for Saitek devices that are not fully compliant with the
+       HID standard.
+       Currently only supports the PS1000 controller.
  config HID_SAMSUNG
        tristate "Samsung InfraRed remote control or keyboards"
        depends on USB_HID
@@@ -549,6 -608,12 +563,12 @@@ config SMARTJOYPLUS_F
        Say Y here if you have a SmartJoy PLUS PS2/USB adapter and want to
        enable force feedback support for it.
  
+ config HID_TIVO
+       tristate "TiVo Slide Bluetooth remote control support"
+       depends on (USB_HID || BT_HIDP)
+       ---help---
+       Say Y if you have a TiVo Slide Bluetooth remote control.
  config HID_TOPSEED
        tristate "TopSeed Cyberlink, BTC Emprex, Conceptronic remote control support"
        depends on USB_HID
diff --combined drivers/hid/Makefile
index 7d926719e21b7d214ad87c20a7264c09193c6b69,524532b49eaa250ce06c15dfc6d8ad98153c184d..22f1d16cd79c7a680a6983812146459fd76ff1ab
@@@ -64,9 -64,15 +64,10 @@@ obj-$(CONFIG_HID_PANTHERLORD)       += hid-pl
  obj-$(CONFIG_HID_PETALYNX)    += hid-petalynx.o
  obj-$(CONFIG_HID_PICOLCD)     += hid-picolcd.o
  obj-$(CONFIG_HID_PRIMAX)      += hid-primax.o
 -obj-$(CONFIG_HID_ROCCAT)      += hid-roccat.o
 -obj-$(CONFIG_HID_ROCCAT_COMMON)       += hid-roccat-common.o
 -obj-$(CONFIG_HID_ROCCAT_ARVO) += hid-roccat-arvo.o
 -obj-$(CONFIG_HID_ROCCAT_ISKU) += hid-roccat-isku.o
 -obj-$(CONFIG_HID_ROCCAT_KONE) += hid-roccat-kone.o
 -obj-$(CONFIG_HID_ROCCAT_KONEPLUS)     += hid-roccat-koneplus.o
 -obj-$(CONFIG_HID_ROCCAT_KOVAPLUS)     += hid-roccat-kovaplus.o
 -obj-$(CONFIG_HID_ROCCAT_PYRA) += hid-roccat-pyra.o
 +obj-$(CONFIG_HID_ROCCAT)      += hid-roccat.o hid-roccat-common.o \
 +      hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \
 +      hid-roccat-koneplus.o hid-roccat-kovaplus.o hid-roccat-pyra.o
+ obj-$(CONFIG_HID_SAITEK)      += hid-saitek.o
  obj-$(CONFIG_HID_SAMSUNG)     += hid-samsung.o
  obj-$(CONFIG_HID_SMARTJOYPLUS)        += hid-sjoy.o
  obj-$(CONFIG_HID_SONY)                += hid-sony.o
@@@ -74,6 -80,7 +75,7 @@@ obj-$(CONFIG_HID_SPEEDLINK)   += hid-spee
  obj-$(CONFIG_HID_SUNPLUS)     += hid-sunplus.o
  obj-$(CONFIG_HID_GREENASIA)   += hid-gaff.o
  obj-$(CONFIG_HID_THRUSTMASTER)        += hid-tmff.o
+ obj-$(CONFIG_HID_TIVO)                += hid-tivo.o
  obj-$(CONFIG_HID_TOPSEED)     += hid-topseed.o
  obj-$(CONFIG_HID_TWINHAN)     += hid-twinhan.o
  obj-$(CONFIG_HID_UCLOGIC)     += hid-uclogic.o
diff --combined drivers/hid/hid-core.c
index 05a0c9a35bf297c77f92dc2101606cb8998e6e47,8ea595236d642c5dd7f3fe1a508046663712fc2a..f5d1ca8272c501772858a0ab51a0423566152af3
@@@ -4,7 -4,7 +4,7 @@@
   *  Copyright (c) 1999 Andreas Gal
   *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
   *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
-  *  Copyright (c) 2006-2010 Jiri Kosina
+  *  Copyright (c) 2006-2012 Jiri Kosina
   */
  
  /*
@@@ -50,6 -50,10 +50,10 @@@ module_param_named(debug, hid_debug, in
  MODULE_PARM_DESC(debug, "toggle HID debugging messages");
  EXPORT_SYMBOL_GPL(hid_debug);
  
+ static int hid_ignore_special_drivers = 0;
+ module_param_named(ignore_special_drivers, hid_ignore_special_drivers, int, 0600);
+ MODULE_PARM_DESC(debug, "Ignore any special drivers and handle all devices by generic driver");
  /*
   * Register a new report for a device.
   */
@@@ -1232,6 -1236,7 +1236,6 @@@ int hid_connect(struct hid_device *hdev
                hdev->claimed |= HID_CLAIMED_INPUT;
        if (hdev->quirks & HID_QUIRK_MULTITOUCH) {
                /* this device should be handled by hid-multitouch, skip it */
 -              hdev->quirks &= ~HID_QUIRK_MULTITOUCH;
                return -ENODEV;
        }
  
@@@ -1395,6 -1400,7 +1399,7 @@@ static const struct hid_device_id hid_h
        { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHUNGHWAT, USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CVTOUCH, USB_DEVICE_ID_CVTOUCH_SCREEN) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },
        { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
        { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_FRUCTEL, USB_DEVICE_ID_GAMETEL_MT_MODE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KEYTOUCH, USB_DEVICE_ID_KEYTOUCH_IEC) },
        { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_I405X) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LG, USB_DEVICE_ID_LG_MULTITOUCH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G27_WHEEL) },
+ #if IS_ENABLED(CONFIG_HID_LOGITECH_DJ)
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER_2) },
+ #endif
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WII_WHEEL) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACETRAVELLER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_PANASONIC, USB_DEVICE_ID_PANABOARD_UBT780) },
 +      { HID_USB_DEVICE(USB_VENDOR_ID_PANASONIC, USB_DEVICE_ID_PANABOARD_UBT880) },
        { HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_PCI) },
        { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KOVAPLUS) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRED) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_PYRA_WIRELESS) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_PS1000) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) },
+       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE_BT) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_TIVO, USB_DEVICE_ID_TIVO_SLIDE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },
        { HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2, USB_DEVICE_ID_TOPSEED2_RF_COMBO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_TOUCH_INTL, USB_DEVICE_ID_TOUCH_INTL_MULTI_TOUCH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_UNITEC, USB_DEVICE_ID_UNITEC_USB_TOUCH_0709) },
        { HID_USB_DEVICE(USB_VENDOR_ID_UNITEC, USB_DEVICE_ID_UNITEC_USB_TOUCH_0A19) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SUPER_JOY_BOX_3) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_3_PRO) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO) },
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_Q_PAD) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_PID_0038) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH) },
        { HID_USB_DEVICE(USB_VENDOR_ID_XAT, USB_DEVICE_ID_XAT_CSR) },
@@@ -1666,15 -1680,11 +1683,15 @@@ static int hid_bus_match(struct device 
        struct hid_driver *hdrv = container_of(drv, struct hid_driver, driver);
        struct hid_device *hdev = container_of(dev, struct hid_device, dev);
  
 +      if ((hdev->quirks & HID_QUIRK_MULTITOUCH) &&
 +              !strncmp(hdrv->name, "hid-multitouch", 14))
 +              return 1;
 +
        if (!hid_match_device(hdev, hdrv))
                return 0;
  
        /* generic wants all that don't have specialized driver */
-       if (!strncmp(hdrv->name, "generic-", 8))
+       if (!strncmp(hdrv->name, "generic-", 8) && !hid_ignore_special_drivers)
                return !hid_match_id(hdev, hid_have_special_driver);
  
        return 1;
@@@ -1694,11 -1704,8 +1711,11 @@@ static int hid_device_probe(struct devi
        if (!hdev->driver) {
                id = hid_match_device(hdev, hdrv);
                if (id == NULL) {
 -                      ret = -ENODEV;
 -                      goto unlock;
 +                      if (!((hdev->quirks & HID_QUIRK_MULTITOUCH) &&
 +                              !strncmp(hdrv->name, "hid-multitouch", 14))) {
 +                              ret = -ENODEV;
 +                              goto unlock;
 +                      }
                }
  
                hdev->driver = hdrv;
diff --combined drivers/hid/hid-ids.h
index 55360fefee5bea506dcff90032850155acc06428,5d7ef721f09ca1b99f6954fa60c83853d88b3431..3eb00902ca408ea363942c8b8dc21ff515096b3b
@@@ -41,7 -41,7 +41,7 @@@
  #define USB_VENDOR_ID_ACTIONSTAR      0x2101
  #define USB_DEVICE_ID_ACTIONSTAR_1011 0x1011
  
 -#define USB_VENDOR_ID_ADS_TECH                0x06e1
 +#define USB_VENDOR_ID_ADS_TECH                0x06e1
  #define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X   0xa155
  
  #define USB_VENDOR_ID_AFATECH         0x15a4
@@@ -59,9 -59,6 +59,9 @@@
  #define USB_VENDOR_ID_AIRCABLE                0x16CA
  #define USB_DEVICE_ID_AIRCABLE1               0x1502
  
 +#define USB_VENDOR_ID_AIREN           0x1a2c
 +#define USB_DEVICE_ID_AIREN_SLIMPLUS  0x0002
 +
  #define USB_VENDOR_ID_ALCOR           0x058f
  #define USB_DEVICE_ID_ALCOR_USBRS232  0x9720
  
  
  #define USB_VENDOR_ID_ATMEL           0x03eb
  #define USB_DEVICE_ID_ATMEL_MULTITOUCH        0x211c
 +#define USB_DEVICE_ID_ATMEL_MXT_DIGITIZER     0x2118
  
  #define USB_VENDOR_ID_AVERMEDIA               0x07ca
  #define USB_DEVICE_ID_AVER_FM_MR800   0xb800
  #define USB_VENDOR_ID_CH              0x068e
  #define USB_DEVICE_ID_CH_PRO_THROTTLE 0x00f1
  #define USB_DEVICE_ID_CH_PRO_PEDALS   0x00f2
+ #define USB_DEVICE_ID_CH_FIGHTERSTICK 0x00f3
  #define USB_DEVICE_ID_CH_COMBATSTICK  0x00f4
  #define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE       0x0051
  #define USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE      0x00ff
  #define USB_DEVICE_ID_CHICONY_TACTICAL_PAD    0x0418
  #define USB_DEVICE_ID_CHICONY_MULTI_TOUCH     0xb19d
  #define USB_DEVICE_ID_CHICONY_WIRELESS        0x0618
+ #define USB_DEVICE_ID_CHICONY_WIRELESS2       0x1123
  
  #define USB_VENDOR_ID_CHUNGHWAT               0x2247
  #define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH    0x0001
  #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER  0x0001
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D     0x480d
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E     0x480e
 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207     0x7207
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C     0x720c
 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224     0x7224
 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A     0x722A
 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E     0x725e
 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262     0x7262
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B     0x726b
 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA     0x72aa
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1     0x72a1
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA     0x72fa
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302     0x7302
 +#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349     0x7349
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001     0xa001
  
  #define USB_VENDOR_ID_ELECOM          0x056e
  #define USB_VENDOR_ID_EZKEY           0x0518
  #define USB_DEVICE_ID_BTC_8193                0x0002
  
+ #define USB_VENDOR_ID_FRUCTEL 0x25B6
+ #define USB_DEVICE_ID_GAMETEL_MT_MODE 0x0002
  #define USB_VENDOR_ID_GAMERON         0x0810
  #define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR        0x0001
  #define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR        0x0002
  
  #define USB_VENDOR_ID_IDEACOM         0x1cb6
  #define USB_DEVICE_ID_IDEACOM_IDC6650 0x6650
 +#define USB_DEVICE_ID_IDEACOM_IDC6651 0x6651
  
  #define USB_VENDOR_ID_ILITEK          0x222a
  #define USB_DEVICE_ID_ILITEK_MULTITOUCH       0x0001
  #define USB_VENDOR_ID_KYE             0x0458
  #define USB_DEVICE_ID_KYE_ERGO_525V   0x0087
  #define USB_DEVICE_ID_KYE_GPEN_560    0x5003
+ #define USB_DEVICE_ID_KYE_EASYPEN_I405X       0x5010
+ #define USB_DEVICE_ID_KYE_MOUSEPEN_I608X      0x5011
+ #define USB_DEVICE_ID_KYE_EASYPEN_M610X       0x5013
  
  #define USB_VENDOR_ID_LABTEC          0x1020
  #define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD        0x0006
  #define USB_DEVICE_ID_ORTEK_PKB1700   0x1700
  #define USB_DEVICE_ID_ORTEK_WKB2000   0x2000
  
 +#define USB_VENDOR_ID_PANASONIC               0x04da
 +#define USB_DEVICE_ID_PANABOARD_UBT780        0x1044
 +#define USB_DEVICE_ID_PANABOARD_UBT880        0x104d
 +
  #define USB_VENDOR_ID_PANJIT          0x134c
  
  #define USB_VENDOR_ID_PANTHERLORD     0x0810
  
  #define USB_VENDOR_ID_SAITEK          0x06a3
  #define USB_DEVICE_ID_SAITEK_RUMBLEPAD        0xff17
+ #define USB_DEVICE_ID_SAITEK_PS1000   0x0621
  
  #define USB_VENDOR_ID_SAMSUNG         0x0419
  #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE       0x0001
  
  #define USB_VENDOR_ID_THRUSTMASTER    0x044f
  
+ #define USB_VENDOR_ID_TIVO            0x150a
+ #define USB_DEVICE_ID_TIVO_SLIDE_BT   0x1200
+ #define USB_DEVICE_ID_TIVO_SLIDE      0x1201
  #define USB_VENDOR_ID_TOPSEED         0x0766
  #define USB_DEVICE_ID_TOPSEED_CYBERLINK       0x0204
  
  #define USB_VENDOR_ID_TOPSEED2                0x1784
  #define USB_DEVICE_ID_TOPSEED2_RF_COMBO       0x0004
 +#define USB_DEVICE_ID_TOPSEED2_PERIPAD_701    0x0016
  
  #define USB_VENDOR_ID_TOPMAX          0x0663
  #define USB_DEVICE_ID_TOPMAX_COBRAPAD 0x0103
  #define USB_VENDOR_ID_WALTOP                          0x172f
  #define USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH     0x0032
  #define USB_DEVICE_ID_WALTOP_SLIM_TABLET_12_1_INCH    0x0034
+ #define USB_DEVICE_ID_WALTOP_Q_PAD                    0x0037
+ #define USB_DEVICE_ID_WALTOP_PID_0038                 0x0038
  #define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH   0x0501
  #define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH   0x0500
  
  #define USB_DEVICE_ID_1_PHIDGETSERVO_20       0x8101
  #define USB_DEVICE_ID_4_PHIDGETSERVO_20       0x8104
  #define USB_DEVICE_ID_8_8_4_IF_KIT    0x8201
+ #define USB_DEVICE_ID_SUPER_JOY_BOX_3 0x8888
  #define USB_DEVICE_ID_QUAD_USB_JOYPAD 0x8800
  #define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866
  
index 6fb46d70f39d3f44b9b75196d0f5c5d55ab80066,ddba4c50815bb71d00296cfe7e3c9519669a30fd..1d5b94167b521566268d91077b307c68a29d04cc
@@@ -1,9 -1,9 +1,9 @@@
  /*
   *  HID driver for multitouch panels
   *
 - *  Copyright (c) 2010-2011 Stephane Chatty <chatty@enac.fr>
 - *  Copyright (c) 2010-2011 Benjamin Tissoires <benjamin.tissoires@gmail.com>
 - *  Copyright (c) 2010-2011 Ecole Nationale de l'Aviation Civile, France
 + *  Copyright (c) 2010-2012 Stephane Chatty <chatty@enac.fr>
 + *  Copyright (c) 2010-2012 Benjamin Tissoires <benjamin.tissoires@gmail.com>
 + *  Copyright (c) 2010-2012 Ecole Nationale de l'Aviation Civile, France
   *
   *  This code is partly based on hid-egalax.c:
   *
@@@ -67,7 -67,6 +67,7 @@@ struct mt_class 
        __s32 sn_height;        /* Signal/noise ratio for height events */
        __s32 sn_pressure;      /* Signal/noise ratio for pressure events */
        __u8 maxcontacts;
 +      bool is_indirect;       /* true for touchpads */
  };
  
  struct mt_device {
        struct mt_class mtclass;        /* our mt device class */
        unsigned last_field_index;      /* last field index of the report */
        unsigned last_slot_field;       /* the last field of a slot */
 -      int last_mt_collection; /* last known mt-related collection */
        __s8 inputmode;         /* InputMode HID feature, -1 if non-existent */
 +      __s8 maxcontact_report_id;      /* Maximum Contact Number HID feature,
 +                                 -1 if non-existent */
        __u8 num_received;      /* how many contacts we received */
        __u8 num_expected;      /* expected last contact index */
        __u8 maxcontacts;
 +      __u8 touches_by_report; /* how many touches are present in one report:
 +                              * 1 means we should use a serial protocol
 +                              * > 1 means hybrid (multitouch) protocol */
        bool curvalid;          /* is the current contact valid? */
        struct mt_slot *slots;
  };
  #define MT_CLS_CYPRESS                                0x0102
  #define MT_CLS_EGALAX                         0x0103
  #define MT_CLS_EGALAX_SERIAL                  0x0104
 +#define MT_CLS_TOPSEED                                0x0105
 +#define MT_CLS_PANASONIC                      0x0106
  
  #define MT_DEFAULT_MAXCONTACT 10
  
@@@ -196,14 -189,6 +196,14 @@@ static struct mt_class mt_classes[] = 
                .sn_move = 4096,
                .sn_pressure = 32,
        },
 +      { .name = MT_CLS_TOPSEED,
 +              .quirks = MT_QUIRK_ALWAYS_VALID,
 +              .is_indirect = true,
 +              .maxcontacts = 2,
 +      },
 +      { .name = MT_CLS_PANASONIC,
 +              .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP,
 +              .maxcontacts = 4 },
  
        { }
  };
@@@ -256,7 -241,6 +256,7 @@@ static void mt_feature_mapping(struct h
                td->inputmode = field->report->id;
                break;
        case HID_DG_CONTACTMAX:
 +              td->maxcontact_report_id = field->report->id;
                td->maxcontacts = field->value[0];
                if (td->mtclass.maxcontacts)
                        /* check if the maxcontacts is given by the class */
@@@ -275,44 -259,23 +275,44 @@@ static void set_abs(struct input_dev *i
        input_set_abs_params(input, code, fmin, fmax, fuzz, 0);
  }
  
 +static void set_last_slot_field(struct hid_usage *usage, struct mt_device *td,
 +              struct hid_input *hi)
 +{
 +      if (!test_bit(usage->hid, hi->input->absbit))
 +              td->last_slot_field = usage->hid;
 +}
 +
  static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                struct hid_field *field, struct hid_usage *usage,
                unsigned long **bit, int *max)
  {
        struct mt_device *td = hid_get_drvdata(hdev);
        struct mt_class *cls = &td->mtclass;
 +      int code;
  
        /* Only map fields from TouchScreen or TouchPad collections.
 -         * We need to ignore fields that belong to other collections
 -         * such as Mouse that might have the same GenericDesktop usages. */
 +      * We need to ignore fields that belong to other collections
 +      * such as Mouse that might have the same GenericDesktop usages. */
        if (field->application == HID_DG_TOUCHSCREEN)
                set_bit(INPUT_PROP_DIRECT, hi->input->propbit);
 -      else if (field->application == HID_DG_TOUCHPAD)
 -              set_bit(INPUT_PROP_POINTER, hi->input->propbit);
 -      else
 +      else if (field->application != HID_DG_TOUCHPAD)
                return 0;
  
 +      /* In case of an indirect device (touchpad), we need to add
 +       * specific BTN_TOOL_* to be handled by the synaptics xorg
 +       * driver.
 +       * We also consider that touchscreens providing buttons are touchpads.
 +       */
 +      if (field->application == HID_DG_TOUCHPAD ||
 +          (usage->hid & HID_USAGE_PAGE) == HID_UP_BUTTON ||
 +          cls->is_indirect) {
 +              set_bit(INPUT_PROP_POINTER, hi->input->propbit);
 +              set_bit(BTN_TOOL_FINGER, hi->input->keybit);
 +              set_bit(BTN_TOOL_DOUBLETAP, hi->input->keybit);
 +              set_bit(BTN_TOOL_TRIPLETAP, hi->input->keybit);
 +              set_bit(BTN_TOOL_QUADTAP, hi->input->keybit);
 +      }
 +
        /* eGalax devices provide a Digitizer.Stylus input which overrides
         * the correct Digitizers.Finger X/Y ranges.
         * Let's just ignore this input. */
                                cls->sn_move);
                        /* touchscreen emulation */
                        set_abs(hi->input, ABS_X, field, cls->sn_move);
 -                      if (td->last_mt_collection == usage->collection_index) {
 -                              td->last_slot_field = usage->hid;
 -                              td->last_field_index = field->index;
 -                      }
 +                      set_last_slot_field(usage, td, hi);
 +                      td->last_field_index = field->index;
                        return 1;
                case HID_GD_Y:
                        hid_map_usage(hi, usage, bit, max,
                                cls->sn_move);
                        /* touchscreen emulation */
                        set_abs(hi->input, ABS_Y, field, cls->sn_move);
 -                      if (td->last_mt_collection == usage->collection_index) {
 -                              td->last_slot_field = usage->hid;
 -                              td->last_field_index = field->index;
 -                      }
 +                      set_last_slot_field(usage, td, hi);
 +                      td->last_field_index = field->index;
                        return 1;
                }
                return 0;
        case HID_UP_DIGITIZER:
                switch (usage->hid) {
                case HID_DG_INRANGE:
 -                      if (td->last_mt_collection == usage->collection_index) {
 -                              td->last_slot_field = usage->hid;
 -                              td->last_field_index = field->index;
 -                      }
 +                      set_last_slot_field(usage, td, hi);
 +                      td->last_field_index = field->index;
                        return 1;
                case HID_DG_CONFIDENCE:
 -                      if (td->last_mt_collection == usage->collection_index) {
 -                              td->last_slot_field = usage->hid;
 -                              td->last_field_index = field->index;
 -                      }
 +                      set_last_slot_field(usage, td, hi);
 +                      td->last_field_index = field->index;
                        return 1;
                case HID_DG_TIPSWITCH:
                        hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);
                        input_set_capability(hi->input, EV_KEY, BTN_TOUCH);
 -                      if (td->last_mt_collection == usage->collection_index) {
 -                              td->last_slot_field = usage->hid;
 -                              td->last_field_index = field->index;
 -                      }
 +                      set_last_slot_field(usage, td, hi);
 +                      td->last_field_index = field->index;
                        return 1;
                case HID_DG_CONTACTID:
                        if (!td->maxcontacts)
                        input_mt_init_slots(hi->input, td->maxcontacts);
                        td->last_slot_field = usage->hid;
                        td->last_field_index = field->index;
 -                      td->last_mt_collection = usage->collection_index;
 +                      td->touches_by_report++;
                        return 1;
                case HID_DG_WIDTH:
                        hid_map_usage(hi, usage, bit, max,
                                        EV_ABS, ABS_MT_TOUCH_MAJOR);
                        set_abs(hi->input, ABS_MT_TOUCH_MAJOR, field,
                                cls->sn_width);
 -                      if (td->last_mt_collection == usage->collection_index) {
 -                              td->last_slot_field = usage->hid;
 -                              td->last_field_index = field->index;
 -                      }
 +                      set_last_slot_field(usage, td, hi);
 +                      td->last_field_index = field->index;
                        return 1;
                case HID_DG_HEIGHT:
                        hid_map_usage(hi, usage, bit, max,
                                cls->sn_height);
                        input_set_abs_params(hi->input,
                                        ABS_MT_ORIENTATION, 0, 1, 0, 0);
 -                      if (td->last_mt_collection == usage->collection_index) {
 -                              td->last_slot_field = usage->hid;
 -                              td->last_field_index = field->index;
 -                      }
 +                      set_last_slot_field(usage, td, hi);
 +                      td->last_field_index = field->index;
                        return 1;
                case HID_DG_TIPPRESSURE:
                        hid_map_usage(hi, usage, bit, max,
                        /* touchscreen emulation */
                        set_abs(hi->input, ABS_PRESSURE, field,
                                cls->sn_pressure);
 -                      if (td->last_mt_collection == usage->collection_index) {
 -                              td->last_slot_field = usage->hid;
 -                              td->last_field_index = field->index;
 -                      }
 +                      set_last_slot_field(usage, td, hi);
 +                      td->last_field_index = field->index;
                        return 1;
                case HID_DG_CONTACTCOUNT:
 -                      if (td->last_mt_collection == usage->collection_index)
 -                              td->last_field_index = field->index;
 +                      td->last_field_index = field->index;
                        return 1;
                case HID_DG_CONTACTMAX:
                        /* we don't set td->last_slot_field as contactcount and
                         * contact max are global to the report */
 -                      if (td->last_mt_collection == usage->collection_index)
 -                              td->last_field_index = field->index;
 +                      td->last_field_index = field->index;
                        return -1;
                }
 +              case HID_DG_TOUCH:
 +                      /* Legacy devices use TIPSWITCH and not TOUCH.
 +                       * Let's just ignore this field. */
 +                      return -1;
                /* let hid-input decide for the others */
                return 0;
  
 +      case HID_UP_BUTTON:
 +              code = BTN_MOUSE + ((usage->hid - 1) & HID_USAGE);
 +              hid_map_usage(hi, usage, bit, max, EV_KEY, code);
 +              input_set_capability(hi->input, EV_KEY, code);
 +              return 1;
 +
        case 0xff000000:
                /* we do not want to map these: no input-oriented meaning */
                return -1;
@@@ -567,17 -538,15 +567,17 @@@ static int mt_event(struct hid_device *
                        if (value)
                                td->num_expected = value;
                        break;
 +              case HID_DG_TOUCH:
 +                      /* do nothing */
 +                      break;
  
                default:
                        /* fallback to the generic hidinput handling */
                        return 0;
                }
  
 -              if (usage->hid == td->last_slot_field) {
 +              if (usage->hid == td->last_slot_field)
                        mt_complete_slot(td);
 -              }
  
                if (field->index == td->last_field_index
                        && td->num_received >= td->num_expected)
@@@ -609,44 -578,16 +609,44 @@@ static void mt_set_input_mode(struct hi
        }
  }
  
 +static void mt_set_maxcontacts(struct hid_device *hdev)
 +{
 +      struct mt_device *td = hid_get_drvdata(hdev);
 +      struct hid_report *r;
 +      struct hid_report_enum *re;
 +      int fieldmax, max;
 +
 +      if (td->maxcontact_report_id < 0)
 +              return;
 +
 +      if (!td->mtclass.maxcontacts)
 +              return;
 +
 +      re = &hdev->report_enum[HID_FEATURE_REPORT];
 +      r = re->report_id_hash[td->maxcontact_report_id];
 +      if (r) {
 +              max = td->mtclass.maxcontacts;
 +              fieldmax = r->field[0]->logical_maximum;
 +              max = min(fieldmax, max);
 +              if (r->field[0]->value[0] != max) {
 +                      r->field[0]->value[0] = max;
 +                      usbhid_submit_report(hdev, r, USB_DIR_OUT);
 +              }
 +      }
 +}
 +
  static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
  {
        int ret, i;
        struct mt_device *td;
        struct mt_class *mtclass = mt_classes; /* MT_CLS_DEFAULT */
  
 -      for (i = 0; mt_classes[i].name ; i++) {
 -              if (id->driver_data == mt_classes[i].name) {
 -                      mtclass = &(mt_classes[i]);
 -                      break;
 +      if (id) {
 +              for (i = 0; mt_classes[i].name ; i++) {
 +                      if (id->driver_data == mt_classes[i].name) {
 +                              mtclass = &(mt_classes[i]);
 +                              break;
 +                      }
                }
        }
  
         * that emit events over several HID messages.
         */
        hdev->quirks |= HID_QUIRK_NO_INPUT_SYNC;
 +      hdev->quirks &= ~HID_QUIRK_MULTITOUCH;
  
        td = kzalloc(sizeof(struct mt_device), GFP_KERNEL);
        if (!td) {
        }
        td->mtclass = *mtclass;
        td->inputmode = -1;
 -      td->last_mt_collection = -1;
 +      td->maxcontact_report_id = -1;
        hid_set_drvdata(hdev, td);
  
        ret = hid_parse(hdev);
        if (ret)
                goto fail;
  
 +      if (!id && td->touches_by_report == 1) {
 +              /* the device has been sent by hid-generic */
 +              mtclass = &td->mtclass;
 +              mtclass->quirks |= MT_QUIRK_ALWAYS_VALID;
 +              mtclass->quirks &= ~MT_QUIRK_NOT_SEEN_MEANS_UP;
 +              mtclass->quirks &= ~MT_QUIRK_VALID_IS_INRANGE;
 +              mtclass->quirks &= ~MT_QUIRK_VALID_IS_CONFIDENCE;
 +      }
 +
        td->slots = kzalloc(td->maxcontacts * sizeof(struct mt_slot),
                                GFP_KERNEL);
        if (!td->slots) {
  
        ret = sysfs_create_group(&hdev->dev.kobj, &mt_attribute_group);
  
 +      mt_set_maxcontacts(hdev);
        mt_set_input_mode(hdev);
  
        return 0;
@@@ -707,7 -637,6 +707,7 @@@ fail
  #ifdef CONFIG_PM
  static int mt_reset_resume(struct hid_device *hdev)
  {
 +      mt_set_maxcontacts(hdev);
        mt_set_input_mode(hdev);
        return 0;
  }
@@@ -745,9 -674,6 +745,9 @@@ static const struct hid_device_id mt_de
        { .driver_data = MT_CLS_SERIAL,
                HID_USB_DEVICE(USB_VENDOR_ID_ATMEL,
                        USB_DEVICE_ID_ATMEL_MULTITOUCH) },
 +      { .driver_data = MT_CLS_SERIAL,
 +              HID_USB_DEVICE(USB_VENDOR_ID_ATMEL,
 +                      USB_DEVICE_ID_ATMEL_MXT_DIGITIZER) },
  
        /* Cando panels */
        { .driver_data = MT_CLS_DUAL_INRANGE_CONTACTNUMBER,
        { .driver_data = MT_CLS_EGALAX,
                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_720C) },
 +      { .driver_data = MT_CLS_EGALAX_SERIAL,
 +              HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
 +                      USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207) },
 +      { .driver_data = MT_CLS_EGALAX_SERIAL,
 +              HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
 +                      USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_725E) },
 +      { .driver_data = MT_CLS_EGALAX_SERIAL,
 +              HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
 +                      USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7224) },
 +      { .driver_data = MT_CLS_EGALAX_SERIAL,
 +              HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
 +                      USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_722A) },
        { .driver_data = MT_CLS_EGALAX,
                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_726B) },
 +      { .driver_data = MT_CLS_EGALAX_SERIAL,
 +              HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
 +                      USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7262) },
        { .driver_data = MT_CLS_EGALAX,
                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72A1) },
 +      { .driver_data = MT_CLS_EGALAX_SERIAL,
 +              HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
 +                      USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72AA) },
        { .driver_data = MT_CLS_EGALAX,
                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_72FA) },
        { .driver_data = MT_CLS_EGALAX,
                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7302) },
 +      { .driver_data = MT_CLS_EGALAX_SERIAL,
 +              HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
 +                      USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7349) },
        { .driver_data = MT_CLS_EGALAX_SERIAL,
                HID_USB_DEVICE(USB_VENDOR_ID_DWAV,
                        USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001) },
                HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,
                        USB_DEVICE_ID_GENERAL_TOUCH_WIN7_TWOFINGERS) },
  
+       /* Gametel game controller */
+       { .driver_data = MT_CLS_DEFAULT,
+               HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_FRUCTEL,
+                       USB_DEVICE_ID_GAMETEL_MT_MODE) },
        /* GoodTouch panels */
        { .driver_data = MT_CLS_DEFAULT,
                HID_USB_DEVICE(USB_VENDOR_ID_GOODTOUCH,
        { .driver_data = MT_CLS_SERIAL,
                HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM,
                        USB_DEVICE_ID_IDEACOM_IDC6650) },
 +      { .driver_data = MT_CLS_SERIAL,
 +              HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM,
 +                      USB_DEVICE_ID_IDEACOM_IDC6651) },
  
        /* Ilitek dual touch panel */
        {  .driver_data = MT_CLS_DEFAULT,
                HID_USB_DEVICE(USB_VENDOR_ID_TURBOX,
                        USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART) },
  
 +      /* Panasonic panels */
 +      { .driver_data = MT_CLS_PANASONIC,
 +              HID_USB_DEVICE(USB_VENDOR_ID_PANASONIC,
 +                      USB_DEVICE_ID_PANABOARD_UBT780) },
 +      { .driver_data = MT_CLS_PANASONIC,
 +              HID_USB_DEVICE(USB_VENDOR_ID_PANASONIC,
 +                      USB_DEVICE_ID_PANABOARD_UBT880) },
 +
        /* PenMount panels */
        { .driver_data = MT_CLS_CONFIDENCE,
                HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT,
                HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_SITRONIX,
                        USB_DEVICE_ID_MTP_SITRONIX)},
  
 +      /* TopSeed panels */
 +      { .driver_data = MT_CLS_TOPSEED,
 +              HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED2,
 +                      USB_DEVICE_ID_TOPSEED2_PERIPAD_701) },
 +
        /* Touch International panels */
        { .driver_data = MT_CLS_DEFAULT,
                HID_USB_DEVICE(USB_VENDOR_ID_TOUCH_INTL,
diff --combined drivers/hid/hid-wacom.c
index 694545d5bfeab0ed2ce7fd8c5c5602bfd8aa36c3,2d4812e3dbea8ba415d19622025d82743cb69fc6..067e2963314c6882a9f7854267048658388d2aea
  
  #include "hid-ids.h"
  
 +#define PAD_DEVICE_ID 0x0F
 +
  struct wacom_data {
        __u16 tool;
 -      unsigned char butstate;
 +      __u16 butstate;
 +      __u8 whlstate;
        __u8 features;
 +      __u32 id;
 +      __u32 serial;
        unsigned char high_speed;
  #ifdef CONFIG_HID_WACOM_POWER_SUPPLY
        int battery_capacity;
@@@ -54,14 -49,12 +54,14 @@@ static unsigned short batcap[8] = { 1, 
  
  static enum power_supply_property wacom_battery_props[] = {
        POWER_SUPPLY_PROP_PRESENT,
 -      POWER_SUPPLY_PROP_CAPACITY
 +      POWER_SUPPLY_PROP_CAPACITY,
 +      POWER_SUPPLY_PROP_SCOPE,
  };
  
  static enum power_supply_property wacom_ac_props[] = {
        POWER_SUPPLY_PROP_PRESENT,
 -      POWER_SUPPLY_PROP_ONLINE
 +      POWER_SUPPLY_PROP_ONLINE,
 +      POWER_SUPPLY_PROP_SCOPE,
  };
  
  static int wacom_battery_get_property(struct power_supply *psy,
@@@ -77,9 -70,6 +77,9 @@@
        case POWER_SUPPLY_PROP_PRESENT:
                val->intval = 1;
                break;
 +      case POWER_SUPPLY_PROP_SCOPE:
 +              val->intval = POWER_SUPPLY_SCOPE_DEVICE;
 +              break;
        case POWER_SUPPLY_PROP_CAPACITY:
                /* show 100% battery capacity when charging */
                if (power_state == 0)
@@@ -111,9 -101,6 +111,9 @@@ static int wacom_ac_get_property(struc
                else
                        val->intval = 0;
                break;
 +      case POWER_SUPPLY_PROP_SCOPE:
 +              val->intval = POWER_SUPPLY_SCOPE_DEVICE;
 +              break;
        default:
                ret = -EINVAL;
                break;
@@@ -319,82 -306,30 +319,82 @@@ static int wacom_gr_parse_report(struc
        return 1;
  }
  
 +static void wacom_i4_parse_button_report(struct wacom_data *wdata,
 +                      struct input_dev *input, unsigned char *data)
 +{
 +      __u16 new_butstate;
 +      __u8 new_whlstate;
 +      __u8 sync = 0;
 +
 +      new_whlstate = data[1];
 +      if (new_whlstate != wdata->whlstate) {
 +              wdata->whlstate = new_whlstate;
 +              if (new_whlstate & 0x80) {
 +                      input_report_key(input, BTN_TOUCH, 1);
 +                      input_report_abs(input, ABS_WHEEL, (new_whlstate & 0x7f));
 +                      input_report_key(input, BTN_TOOL_FINGER, 1);
 +              } else {
 +                      input_report_key(input, BTN_TOUCH, 0);
 +                      input_report_abs(input, ABS_WHEEL, 0);
 +                      input_report_key(input, BTN_TOOL_FINGER, 0);
 +              }
 +              sync = 1;
 +      }
 +
 +      new_butstate = (data[3] << 1) | (data[2] & 0x01);
 +      if (new_butstate != wdata->butstate) {
 +              wdata->butstate = new_butstate;
 +              input_report_key(input, BTN_0, new_butstate & 0x001);
 +              input_report_key(input, BTN_1, new_butstate & 0x002);
 +              input_report_key(input, BTN_2, new_butstate & 0x004);
 +              input_report_key(input, BTN_3, new_butstate & 0x008);
 +              input_report_key(input, BTN_4, new_butstate & 0x010);
 +              input_report_key(input, BTN_5, new_butstate & 0x020);
 +              input_report_key(input, BTN_6, new_butstate & 0x040);
 +              input_report_key(input, BTN_7, new_butstate & 0x080);
 +              input_report_key(input, BTN_8, new_butstate & 0x100);
 +              input_report_key(input, BTN_TOOL_FINGER, 1);
 +              sync = 1;
 +      }
 +
 +      if (sync) {
 +              input_report_abs(input, ABS_MISC, PAD_DEVICE_ID);
 +              input_event(input, EV_MSC, MSC_SERIAL, 0xffffffff);
 +              input_sync(input);
 +      }
 +}
 +
  static void wacom_i4_parse_pen_report(struct wacom_data *wdata,
                        struct input_dev *input, unsigned char *data)
  {
        __u16 x, y, pressure;
 -      __u32 id;
 +      __u8 distance;
  
        switch (data[1]) {
        case 0x80: /* Out of proximity report */
 -              wdata->tool = 0;
                input_report_key(input, BTN_TOUCH, 0);
                input_report_abs(input, ABS_PRESSURE, 0);
 +              input_report_key(input, BTN_STYLUS, 0);
 +              input_report_key(input, BTN_STYLUS2, 0);
                input_report_key(input, wdata->tool, 0);
 +              input_report_abs(input, ABS_MISC, 0);
 +              input_event(input, EV_MSC, MSC_SERIAL, wdata->serial);
 +              wdata->tool = 0;
                input_sync(input);
                break;
        case 0xC2: /* Tool report */
 -              id = ((data[2] << 4) | (data[3] >> 4) |
 +              wdata->id = ((data[2] << 4) | (data[3] >> 4) |
                        ((data[7] & 0x0f) << 20) |
 -                      ((data[8] & 0xf0) << 12)) & 0xfffff;
 +                      ((data[8] & 0xf0) << 12));
 +              wdata->serial = ((data[3] & 0x0f) << 28) +
 +                              (data[4] << 20) + (data[5] << 12) +
 +                              (data[6] << 4) + (data[7] >> 4);
  
 -              switch (id) {
 -              case 0x802:
 +              switch (wdata->id) {
 +              case 0x100802:
                        wdata->tool = BTN_TOOL_PEN;
                        break;
 -              case 0x80A:
 +              case 0x10080A:
                        wdata->tool = BTN_TOOL_RUBBER;
                        break;
                }
                y = data[4] << 9 | data[5] << 1 | (data[9] & 0x01);
                pressure = (data[6] << 3) | ((data[7] & 0xC0) >> 5)
                        | (data[1] & 0x01);
 +              distance = (data[9] >> 2) & 0x3f;
  
                input_report_key(input, BTN_TOUCH, pressure > 1);
  
                input_report_abs(input, ABS_X, x);
                input_report_abs(input, ABS_Y, y);
                input_report_abs(input, ABS_PRESSURE, pressure);
 +              input_report_abs(input, ABS_DISTANCE, distance);
 +              input_report_abs(input, ABS_MISC, wdata->id);
 +              input_event(input, EV_MSC, MSC_SERIAL, wdata->serial);
 +              input_report_key(input, wdata->tool, 1);
                input_sync(input);
                break;
        }
@@@ -439,7 -369,6 +439,7 @@@ static void wacom_i4_parse_report(struc
                wdata->features = data[2];
                break;
        case 0x0C: /* Button report */
 +              wacom_i4_parse_button_report(wdata, input, data);
                break;
        default:
                hid_err(hdev, "Unknown report: %d,%d\n", data[0], data[1]);
@@@ -514,7 -443,9 +514,7 @@@ static int wacom_input_mapped(struct hi
        __set_bit(BTN_MIDDLE, input->keybit);
  
        /* Pad */
 -      input->evbit[0] |= BIT(EV_MSC);
 -
 -      __set_bit(MSC_SERIAL, input->mscbit);
 +      input_set_capability(input, EV_MSC, MSC_SERIAL);
  
        __set_bit(BTN_0, input->keybit);
        __set_bit(BTN_1, input->keybit);
                input_set_abs_params(input, ABS_DISTANCE, 0, 32, 0, 0);
                break;
        case USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH:
 +              __set_bit(ABS_WHEEL, input->absbit);
 +              __set_bit(ABS_MISC, input->absbit);
 +              __set_bit(BTN_2, input->keybit);
 +              __set_bit(BTN_3, input->keybit);
 +              __set_bit(BTN_4, input->keybit);
 +              __set_bit(BTN_5, input->keybit);
 +              __set_bit(BTN_6, input->keybit);
 +              __set_bit(BTN_7, input->keybit);
 +              __set_bit(BTN_8, input->keybit);
 +              input_set_abs_params(input, ABS_WHEEL, 0, 71, 0, 0);
                input_set_abs_params(input, ABS_X, 0, 40640, 4, 0);
                input_set_abs_params(input, ABS_Y, 0, 25400, 4, 0);
                input_set_abs_params(input, ABS_PRESSURE, 0, 2047, 0, 0);
 +              input_set_abs_params(input, ABS_DISTANCE, 0, 63, 0, 0);
                break;
        }
  
@@@ -590,6 -510,7 +590,7 @@@ static int wacom_probe(struct hid_devic
                wacom_poke(hdev, 1);
                break;
        case USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH:
+               sprintf(hdev->name, "%s", "Wacom Intuos4 WL");
                wdata->features = 0;
                wacom_set_features(hdev);
                break;
        wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
        wdata->battery.use_for_apm = 0;
  
 +
        ret = power_supply_register(&hdev->dev, &wdata->battery);
        if (ret) {
                hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n",
                goto err_battery;
        }
  
 +      power_supply_powers(&wdata->battery, &hdev->dev);
 +
        wdata->ac.properties = wacom_ac_props;
        wdata->ac.num_properties = ARRAY_SIZE(wacom_ac_props);
        wdata->ac.get_property = wacom_ac_get_property;
                         "can't create ac battery attribute, err: %d\n", ret);
                goto err_ac;
        }
 +
 +      power_supply_powers(&wdata->ac, &hdev->dev);
  #endif
        return 0;
  
index 0dd0bebac69fbf9c553754c5f8da428aa700b5d3,3cfea61e979232ddfb54008ed3cb5347c3dc252b..782c63955f2953d0098c3838d65a96c5c5c4e0bb
@@@ -54,12 -54,12 +54,13 @@@ static const struct hid_blacklist 
        { USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS, HID_QUIRK_MULTI_INPUT },
  
 +      { USB_VENDOR_ID_AIREN, USB_DEVICE_ID_AIREN_SLIMPLUS, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },
+       { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FIGHTERSTICK, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_COMBATSTICK, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE, HID_QUIRK_NOGET },
@@@ -74,7 -74,6 +75,7 @@@
        { USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN2, HID_QUIRK_NO_INIT_REPORTS },
        { USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET },
 +      { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET },
@@@ -96,6 -95,8 +97,8 @@@
        { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_SIGMA_MICRO, USB_DEVICE_ID_SIGMA_MICRO_KEYBOARD, HID_QUIRK_NO_INIT_REPORTS },
+       { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_MOUSEPEN_I608X, HID_QUIRK_MULTI_INPUT },
+       { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X, HID_QUIRK_MULTI_INPUT },
        { 0, 0 }
  };