Merge branches 'for-4.10/upstream-fixes', 'for-4.11/intel-ish', 'for-4.11/mayflash...
authorJiri Kosina <jkosina@suse.cz>
Mon, 20 Feb 2017 14:01:57 +0000 (15:01 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 20 Feb 2017 14:01:57 +0000 (15:01 +0100)
24 files changed:
drivers/hid/Kconfig
drivers/hid/hid-core.c
drivers/hid/hid-cp2112.c
drivers/hid/hid-ids.h
drivers/hid/hid-lg.c
drivers/hid/hid-mf.c
drivers/hid/hid-microsoft.c
drivers/hid/hid-multitouch.c
drivers/hid/hid-rmi.c
drivers/hid/intel-ish-hid/ipc/hw-ish-regs.h
drivers/hid/intel-ish-hid/ipc/hw-ish.h
drivers/hid/intel-ish-hid/ipc/pci-ish.c
drivers/hid/intel-ish-hid/ishtp-hid.c
drivers/hid/intel-ish-hid/ishtp/bus.c
drivers/hid/intel-ish-hid/ishtp/hbm.c
drivers/hid/intel-ish-hid/ishtp/init.c
drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h
drivers/hid/usbhid/hid-core.c
drivers/hid/usbhid/hid-quirks.c
drivers/hid/usbhid/usbkbd.c
drivers/hid/usbhid/usbmouse.c
drivers/hid/wacom.h
drivers/hid/wacom_sys.c
drivers/hid/wacom_wac.c

index 4070b73..1aeb80e 100644 (file)
@@ -785,6 +785,11 @@ config HID_SUNPLUS
 config HID_RMI
        tristate "Synaptics RMI4 device support"
        depends on HID
+       select RMI4_CORE
+       select RMI4_F03
+       select RMI4_F11
+       select RMI4_F12
+       select RMI4_F30
        ---help---
        Support for Synaptics RMI4 touchpads.
        Say Y here if you have a Synaptics RMI4 touchpads over i2c-hid or usbhid
index ea36b55..538ff69 100644 (file)
@@ -43,7 +43,6 @@
  */
 
 #define DRIVER_DESC "HID core driver"
-#define DRIVER_LICENSE "GPL"
 
 int hid_debug = 0;
 module_param_named(debug, hid_debug, int, 0600);
@@ -724,13 +723,7 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type)
                hid->group = HID_GROUP_SENSOR_HUB;
 
        if (hid->vendor == USB_VENDOR_ID_MICROSOFT &&
-           (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 ||
-            hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 ||
-            hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP ||
-            hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 ||
-            hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 ||
-            hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP ||
-            hid->product == USB_DEVICE_ID_MS_POWER_COVER) &&
+           hid->product == USB_DEVICE_ID_MS_POWER_COVER &&
            hid->group == HID_GROUP_MULTITOUCH)
                hid->group = HID_GROUP_GENERIC;
 
@@ -826,7 +819,8 @@ static int hid_scan_report(struct hid_device *hid)
                hid->group = HID_GROUP_WACOM;
                break;
        case USB_VENDOR_ID_SYNAPTICS:
-               if (hid->group == HID_GROUP_GENERIC)
+               if (hid->group == HID_GROUP_GENERIC ||
+                   hid->group == HID_GROUP_MULTITOUCH_WIN_8)
                        if ((parser->scan_flags & HID_SCAN_FLAG_VENDOR_SPECIFIC)
                            && (parser->scan_flags & HID_SCAN_FLAG_GD_POINTER))
                                /*
@@ -1887,6 +1881,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) },
 #if IS_ENABLED(CONFIG_HID_MAYFLASH)
        { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE1) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE2) },
 #endif
        { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_WN) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_FA) },
@@ -1933,6 +1930,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_CBTKBD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_TPPRODOCK) },
 #endif
+       { HID_USB_DEVICE(USB_VENDOR_ID_LG, USB_DEVICE_ID_LG_MELFAS_MT) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) },
@@ -1985,12 +1983,6 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_OFFICE_KB) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) },
@@ -2126,6 +2118,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14) },
        { HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM6533) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_COVER) },
        { }
 };
 
@@ -2314,7 +2307,7 @@ __ATTRIBUTE_GROUPS(hid_dev);
 
 static int hid_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
-       struct hid_device *hdev = to_hid_device(dev);   
+       struct hid_device *hdev = to_hid_device(dev);
 
        if (add_uevent_var(env, "HID_ID=%04X:%08X:%08X",
                        hdev->bus, hdev->vendor, hdev->product))
@@ -2867,5 +2860,5 @@ module_exit(hid_exit);
 MODULE_AUTHOR("Andreas Gal");
 MODULE_AUTHOR("Vojtech Pavlik");
 MODULE_AUTHOR("Jiri Kosina");
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_LICENSE("GPL");
 
index f31a778..b22d0f8 100644 (file)
@@ -168,7 +168,7 @@ struct cp2112_device {
        atomic_t xfer_avail;
        struct gpio_chip gc;
        u8 *in_out_buffer;
-       spinlock_t lock;
+       struct mutex lock;
 
        struct gpio_desc *desc[8];
        bool gpio_poll;
@@ -186,10 +186,9 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
        struct cp2112_device *dev = gpiochip_get_data(chip);
        struct hid_device *hdev = dev->hdev;
        u8 *buf = dev->in_out_buffer;
-       unsigned long flags;
        int ret;
 
-       spin_lock_irqsave(&dev->lock, flags);
+       mutex_lock(&dev->lock);
 
        ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf,
                                 CP2112_GPIO_CONFIG_LENGTH, HID_FEATURE_REPORT,
@@ -213,8 +212,8 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
        ret = 0;
 
 exit:
-       spin_unlock_irqrestore(&dev->lock, flags);
-       return ret <= 0 ? ret : -EIO;
+       mutex_unlock(&dev->lock);
+       return ret < 0 ? ret : -EIO;
 }
 
 static void cp2112_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
@@ -222,10 +221,9 @@ static void cp2112_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
        struct cp2112_device *dev = gpiochip_get_data(chip);
        struct hid_device *hdev = dev->hdev;
        u8 *buf = dev->in_out_buffer;
-       unsigned long flags;
        int ret;
 
-       spin_lock_irqsave(&dev->lock, flags);
+       mutex_lock(&dev->lock);
 
        buf[0] = CP2112_GPIO_SET;
        buf[1] = value ? 0xff : 0;
@@ -237,7 +235,7 @@ static void cp2112_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
        if (ret < 0)
                hid_err(hdev, "error setting GPIO values: %d\n", ret);
 
-       spin_unlock_irqrestore(&dev->lock, flags);
+       mutex_unlock(&dev->lock);
 }
 
 static int cp2112_gpio_get_all(struct gpio_chip *chip)
@@ -245,10 +243,9 @@ static int cp2112_gpio_get_all(struct gpio_chip *chip)
        struct cp2112_device *dev = gpiochip_get_data(chip);
        struct hid_device *hdev = dev->hdev;
        u8 *buf = dev->in_out_buffer;
-       unsigned long flags;
        int ret;
 
-       spin_lock_irqsave(&dev->lock, flags);
+       mutex_lock(&dev->lock);
 
        ret = hid_hw_raw_request(hdev, CP2112_GPIO_GET, buf,
                                 CP2112_GPIO_GET_LENGTH, HID_FEATURE_REPORT,
@@ -262,7 +259,7 @@ static int cp2112_gpio_get_all(struct gpio_chip *chip)
        ret = buf[1];
 
 exit:
-       spin_unlock_irqrestore(&dev->lock, flags);
+       mutex_unlock(&dev->lock);
 
        return ret;
 }
@@ -284,10 +281,9 @@ static int cp2112_gpio_direction_output(struct gpio_chip *chip,
        struct cp2112_device *dev = gpiochip_get_data(chip);
        struct hid_device *hdev = dev->hdev;
        u8 *buf = dev->in_out_buffer;
-       unsigned long flags;
        int ret;
 
-       spin_lock_irqsave(&dev->lock, flags);
+       mutex_lock(&dev->lock);
 
        ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf,
                                 CP2112_GPIO_CONFIG_LENGTH, HID_FEATURE_REPORT,
@@ -308,7 +304,7 @@ static int cp2112_gpio_direction_output(struct gpio_chip *chip,
                goto fail;
        }
 
-       spin_unlock_irqrestore(&dev->lock, flags);
+       mutex_unlock(&dev->lock);
 
        /*
         * Set gpio value when output direction is already set,
@@ -319,7 +315,7 @@ static int cp2112_gpio_direction_output(struct gpio_chip *chip,
        return 0;
 
 fail:
-       spin_unlock_irqrestore(&dev->lock, flags);
+       mutex_unlock(&dev->lock);
        return ret < 0 ? ret : -EIO;
 }
 
@@ -1235,7 +1231,7 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id)
        if (!dev->in_out_buffer)
                return -ENOMEM;
 
-       spin_lock_init(&dev->lock);
+       mutex_init(&dev->lock);
 
        ret = hid_parse(hdev);
        if (ret) {
index f46f2c5..86c95d3 100644 (file)
@@ -76,6 +76,9 @@
 #define USB_VENDOR_ID_ALPS_JP          0x044E
 #define HID_DEVICE_ID_ALPS_U1_DUAL     0x120B
 
+#define USB_VENDOR_ID_AMI              0x046b
+#define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE      0xff10
+
 #define USB_VENDOR_ID_ANTON            0x1130
 #define USB_DEVICE_ID_ANTON_TOUCH_PAD  0x3101
 
 #define USB_DEVICE_ID_DRAGONRISE_WIIU          0x1800
 #define USB_DEVICE_ID_DRAGONRISE_PS3           0x1801
 #define USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR    0x1803
-#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE      0x1843
+#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE1     0x1843
+#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE2     0x1844
 
 #define USB_VENDOR_ID_DWAV             0x0eef
 #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER   0x0001
 #define USB_DEVICE_ID_LENOVO_CUSBKBD   0x6047
 #define USB_DEVICE_ID_LENOVO_CBTKBD    0x6048
 #define USB_DEVICE_ID_LENOVO_TPPRODOCK 0x6067
+#define USB_DEVICE_ID_LENOVO_X1_COVER  0x6085
 
 #define USB_VENDOR_ID_LG               0x1fd2
 #define USB_DEVICE_ID_LG_MULTITOUCH    0x0064
+#define USB_DEVICE_ID_LG_MELFAS_MT     0x6007
 
 #define USB_VENDOR_ID_LOGITECH         0x046d
 #define USB_DEVICE_ID_LOGITECH_AUDIOHUB 0x0a0e
 #define USB_DEVICE_ID_MS_SURFACE_PRO_2   0x0799
 #define USB_DEVICE_ID_MS_TOUCH_COVER_2   0x07a7
 #define USB_DEVICE_ID_MS_TYPE_COVER_2    0x07a9
-#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3    0x07dc
-#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2  0x07e2
-#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd
-#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 0x07e4
-#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 0x07e8
-#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP 0x07e9
 #define USB_DEVICE_ID_MS_POWER_COVER     0x07da
 
 #define USB_VENDOR_ID_MOJO             0x8282
index c5c5fbe..52026dc 100644 (file)
@@ -872,7 +872,7 @@ static const struct hid_device_id lg_devices[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_FFG),
                .driver_data = LG_NOGET | LG_FF4 },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2),
-               .driver_data = LG_FF2 },
+               .driver_data = LG_NOGET | LG_FF2 },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FLIGHT_SYSTEM_G940),
                .driver_data = LG_FF3 },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACENAVIGATOR),
index d909076..03f1051 100644 (file)
@@ -6,12 +6,14 @@
  *
  * Tested with:
  * 0079:1801 "DragonRise Inc. Mayflash PS3 Game Controller Adapter"
+ * 0079:1803 "DragonRise Inc. Mayflash Wireless Sensor DolphinBar"
+ * 0079:1843 "DragonRise Inc. Mayflash GameCube Game Controller Adapter"
+ * 0079:1844 "DragonRise Inc. Mayflash GameCube Game Controller Adapter (v04)"
  *
  * The following adapters probably work too, but need to be tested:
  * 0079:1800 "DragonRise Inc. Mayflash WIIU Game Controller Adapter"
- * 0079:1843 "DragonRise Inc. Mayflash GameCube Game Controller Adapter"
  *
- * Copyright (c) 2016 Marcel Hasler <mahasler@gmail.com>
+ * Copyright (c) 2016-2017 Marcel Hasler <mahasler@gmail.com>
  */
 
 /*
@@ -125,8 +127,8 @@ static int mf_probe(struct hid_device *hid, const struct hid_device_id *id)
 
        dev_dbg(&hid->dev, "Mayflash HID hardware probe...\n");
 
-       /* Split device into four inputs */
-       hid->quirks |= HID_QUIRK_MULTI_INPUT;
+       /* Apply quirks as needed */
+       hid->quirks |= id->driver_data;
 
        error = hid_parse(hid);
        if (error) {
@@ -151,7 +153,14 @@ static int mf_probe(struct hid_device *hid, const struct hid_device_id *id)
 }
 
 static const struct hid_device_id mf_devices[] = {
-       { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3),  },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3),
+               .driver_data = HID_QUIRK_MULTI_INPUT },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR),
+               .driver_data = HID_QUIRK_MULTI_INPUT },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE1),
+               .driver_data = HID_QUIRK_MULTI_INPUT },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE2),
+               .driver_data = 0 }, /* No quirk required */
        { }
 };
 MODULE_DEVICE_TABLE(hid, mf_devices);
index 74b7b84..96e7d32 100644 (file)
@@ -274,18 +274,6 @@ static const struct hid_device_id ms_devices[] = {
                .driver_data = MS_NOGET },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500),
                .driver_data = MS_DUPLICATE_USAGES },
-       { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3),
-               .driver_data = MS_HIDINPUT },
-       { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2),
-               .driver_data = MS_HIDINPUT },
-       { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP),
-               .driver_data = MS_HIDINPUT },
-       { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4),
-               .driver_data = MS_HIDINPUT },
-       { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2),
-               .driver_data = MS_HIDINPUT },
-       { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP),
-               .driver_data = MS_HIDINPUT },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER),
                .driver_data = MS_HIDINPUT },
        { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),
index 6dca668..6926474 100644 (file)
@@ -68,6 +68,7 @@ MODULE_LICENSE("GPL");
 #define MT_QUIRK_HOVERING              (1 << 11)
 #define MT_QUIRK_CONTACT_CNT_ACCURATE  (1 << 12)
 #define MT_QUIRK_FORCE_GET_FEATURE     (1 << 13)
+#define MT_QUIRK_FIX_CONST_CONTACT_ID  (1 << 14)
 
 #define MT_INPUTMODE_TOUCHSCREEN       0x02
 #define MT_INPUTMODE_TOUCHPAD          0x03
@@ -157,6 +158,7 @@ static void mt_post_parse(struct mt_device *td);
 #define MT_CLS_FLATFROG                                0x0107
 #define MT_CLS_GENERALTOUCH_TWOFINGERS         0x0108
 #define MT_CLS_GENERALTOUCH_PWT_TENFINGERS     0x0109
+#define MT_CLS_LG                              0x010a
 #define MT_CLS_VTL                             0x0110
 
 #define MT_DEFAULT_MAXCONTACT  10
@@ -263,6 +265,12 @@ static struct mt_class mt_classes[] = {
                .sn_move = 2048,
                .maxcontacts = 40,
        },
+       { .name = MT_CLS_LG,
+               .quirks = MT_QUIRK_ALWAYS_VALID |
+                       MT_QUIRK_FIX_CONST_CONTACT_ID |
+                       MT_QUIRK_IGNORE_DUPLICATES |
+                       MT_QUIRK_HOVERING |
+                       MT_QUIRK_CONTACT_CNT_ACCURATE },
        { .name = MT_CLS_VTL,
                .quirks = MT_QUIRK_ALWAYS_VALID |
                        MT_QUIRK_CONTACT_CNT_ACCURATE |
@@ -1078,6 +1086,34 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi)
        return 0;
 }
 
+static void mt_fix_const_field(struct hid_field *field, unsigned int usage)
+{
+       if (field->usage[0].hid != usage ||
+           !(field->flags & HID_MAIN_ITEM_CONSTANT))
+               return;
+
+       field->flags &= ~HID_MAIN_ITEM_CONSTANT;
+       field->flags |= HID_MAIN_ITEM_VARIABLE;
+}
+
+static void mt_fix_const_fields(struct hid_device *hdev, unsigned int usage)
+{
+       struct hid_report *report;
+       int i;
+
+       list_for_each_entry(report,
+                           &hdev->report_enum[HID_INPUT_REPORT].report_list,
+                           list) {
+
+               if (!report->maxfield)
+                       continue;
+
+               for (i = 0; i < report->maxfield; i++)
+                       if (report->field[i]->maxusage >= 1)
+                               mt_fix_const_field(report->field[i], usage);
+       }
+}
+
 static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
 {
        int ret, i;
@@ -1151,6 +1187,9 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
        if (ret != 0)
                return ret;
 
+       if (mtclass->quirks & MT_QUIRK_FIX_CONST_CONTACT_ID)
+               mt_fix_const_fields(hdev, HID_DG_CONTACTID);
+
        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
        if (ret)
                return ret;
@@ -1398,6 +1437,11 @@ static const struct hid_device_id mt_devices[] = {
                MT_USB_DEVICE(USB_VENDOR_ID_ILITEK,
                        USB_DEVICE_ID_ILITEK_MULTITOUCH) },
 
+       /* LG Melfas panel */
+       { .driver_data = MT_CLS_LG,
+               HID_USB_DEVICE(USB_VENDOR_ID_LG,
+                       USB_DEVICE_ID_LG_MELFAS_MT) },
+
        /* MosArt panels */
        { .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
                MT_USB_DEVICE(USB_VENDOR_ID_ASUS,
index be89bcb..5b40c26 100644 (file)
 #include <linux/hid.h>
 #include <linux/input.h>
 #include <linux/input/mt.h>
+#include <linux/irq.h>
+#include <linux/irqdomain.h>
 #include <linux/module.h>
 #include <linux/pm.h>
 #include <linux/slab.h>
 #include <linux/wait.h>
 #include <linux/sched.h>
+#include <linux/rmi.h>
 #include "hid-ids.h"
 
 #define RMI_MOUSE_REPORT_ID            0x01 /* Mouse emulation Report */
@@ -33,9 +36,6 @@
 #define RMI_READ_DATA_PENDING          1
 #define RMI_STARTED                    2
 
-#define RMI_SLEEP_NORMAL               0x0
-#define RMI_SLEEP_DEEP_SLEEP           0x1
-
 /* device flags */
 #define RMI_DEVICE                     BIT(0)
 #define RMI_DEVICE_HAS_PHYS_BUTTONS    BIT(1)
@@ -54,25 +54,12 @@ enum rmi_mode_type {
        RMI_MODE_NO_PACKED_ATTN_REPORTS = 2,
 };
 
-struct rmi_function {
-       unsigned page;                  /* page of the function */
-       u16 query_base_addr;            /* base address for queries */
-       u16 command_base_addr;          /* base address for commands */
-       u16 control_base_addr;          /* base address for controls */
-       u16 data_base_addr;             /* base address for datas */
-       unsigned int interrupt_base;    /* cross-function interrupt number
-                                        * (uniq in the device)*/
-       unsigned int interrupt_count;   /* number of interrupts */
-       unsigned int report_size;       /* size of a report */
-       unsigned long irq_mask;         /* mask of the interrupts
-                                        * (to be applied against ATTN IRQ) */
-};
-
 /**
  * struct rmi_data - stores information for hid communication
  *
  * @page_mutex: Locks current page to avoid changing pages in unexpected ways.
  * @page: Keeps track of the current virtual page
+ * @xport: transport device to be registered with the RMI4 core.
  *
  * @wait: Used for waiting for read data
  *
@@ -84,26 +71,18 @@ struct rmi_function {
  *
  * @flags: flags for the current device (started, reading, etc...)
  *
- * @f11: placeholder of internal RMI function F11 description
- * @f30: placeholder of internal RMI function F30 description
- *
- * @max_fingers: maximum finger count reported by the device
- * @max_x: maximum x value reported by the device
- * @max_y: maximum y value reported by the device
- *
- * @gpio_led_count: count of GPIOs + LEDs reported by F30
- * @button_count: actual physical buttons count
- * @button_mask: button mask used to decode GPIO ATTN reports
- * @button_state_mask: pull state of the buttons
- *
- * @input: pointer to the kernel input device
- *
  * @reset_work: worker which will be called in case of a mouse report
  * @hdev: pointer to the struct hid_device
+ *
+ * @device_flags: flags which describe the device
+ *
+ * @domain: the IRQ domain allocated for this RMI4 device
+ * @rmi_irq: the irq that will be used to generate events to rmi-core
  */
 struct rmi_data {
        struct mutex page_mutex;
        int page;
+       struct rmi_transport_dev xport;
 
        wait_queue_head_t wait;
 
@@ -115,34 +94,13 @@ struct rmi_data {
 
        unsigned long flags;
 
-       struct rmi_function f01;
-       struct rmi_function f11;
-       struct rmi_function f30;
-
-       unsigned int max_fingers;
-       unsigned int max_x;
-       unsigned int max_y;
-       unsigned int x_size_mm;
-       unsigned int y_size_mm;
-       bool read_f11_ctrl_regs;
-       u8 f11_ctrl_regs[RMI_F11_CTRL_REG_COUNT];
-
-       unsigned int gpio_led_count;
-       unsigned int button_count;
-       unsigned long button_mask;
-       unsigned long button_state_mask;
-
-       struct input_dev *input;
-
        struct work_struct reset_work;
        struct hid_device *hdev;
 
        unsigned long device_flags;
-       unsigned long firmware_id;
 
-       u8 f01_ctrl0;
-       u8 interrupt_enable_mask;
-       bool restore_interrupt_mask;
+       struct irq_domain *domain;
+       int rmi_irq;
 };
 
 #define RMI_PAGE(addr) (((addr) >> 8) & 0xff)
@@ -220,10 +178,11 @@ static int rmi_write_report(struct hid_device *hdev, u8 *report, int len)
        return ret;
 }
 
-static int rmi_read_block(struct hid_device *hdev, u16 addr, void *buf,
-               const int len)
+static int rmi_hid_read_block(struct rmi_transport_dev *xport, u16 addr,
+               void *buf, size_t len)
 {
-       struct rmi_data *data = hid_get_drvdata(hdev);
+       struct rmi_data *data = container_of(xport, struct rmi_data, xport);
+       struct hid_device *hdev = data->hdev;
        int ret;
        int bytes_read;
        int bytes_needed;
@@ -292,15 +251,11 @@ exit:
        return ret;
 }
 
-static inline int rmi_read(struct hid_device *hdev, u16 addr, void *buf)
-{
-       return rmi_read_block(hdev, addr, buf, 1);
-}
-
-static int rmi_write_block(struct hid_device *hdev, u16 addr, void *buf,
-               const int len)
+static int rmi_hid_write_block(struct rmi_transport_dev *xport, u16 addr,
+               const void *buf, size_t len)
 {
-       struct rmi_data *data = hid_get_drvdata(hdev);
+       struct rmi_data *data = container_of(xport, struct rmi_data, xport);
+       struct hid_device *hdev = data->hdev;
        int ret;
 
        mutex_lock(&data->page_mutex);
@@ -332,62 +287,20 @@ exit:
        return ret;
 }
 
-static inline int rmi_write(struct hid_device *hdev, u16 addr, void *buf)
-{
-       return rmi_write_block(hdev, addr, buf, 1);
-}
-
-static void rmi_f11_process_touch(struct rmi_data *hdata, int slot,
-               u8 finger_state, u8 *touch_data)
-{
-       int x, y, wx, wy;
-       int wide, major, minor;
-       int z;
-
-       input_mt_slot(hdata->input, slot);
-       input_mt_report_slot_state(hdata->input, MT_TOOL_FINGER,
-                       finger_state == 0x01);
-       if (finger_state == 0x01) {
-               x = (touch_data[0] << 4) | (touch_data[2] & 0x0F);
-               y = (touch_data[1] << 4) | (touch_data[2] >> 4);
-               wx = touch_data[3] & 0x0F;
-               wy = touch_data[3] >> 4;
-               wide = (wx > wy);
-               major = max(wx, wy);
-               minor = min(wx, wy);
-               z = touch_data[4];
-
-               /* y is inverted */
-               y = hdata->max_y - y;
-
-               input_event(hdata->input, EV_ABS, ABS_MT_POSITION_X, x);
-               input_event(hdata->input, EV_ABS, ABS_MT_POSITION_Y, y);
-               input_event(hdata->input, EV_ABS, ABS_MT_ORIENTATION, wide);
-               input_event(hdata->input, EV_ABS, ABS_MT_PRESSURE, z);
-               input_event(hdata->input, EV_ABS, ABS_MT_TOUCH_MAJOR, major);
-               input_event(hdata->input, EV_ABS, ABS_MT_TOUCH_MINOR, minor);
-       }
-}
-
 static int rmi_reset_attn_mode(struct hid_device *hdev)
 {
        struct rmi_data *data = hid_get_drvdata(hdev);
+       struct rmi_device *rmi_dev = data->xport.rmi_dev;
        int ret;
 
        ret = rmi_set_mode(hdev, RMI_MODE_ATTN_REPORTS);
        if (ret)
                return ret;
 
-       if (data->restore_interrupt_mask) {
-               ret = rmi_write(hdev, data->f01.control_base_addr + 1,
-                               &data->interrupt_enable_mask);
-               if (ret) {
-                       hid_err(hdev, "can not write F01 control register\n");
-                       return ret;
-               }
-       }
+       if (test_bit(RMI_STARTED, &data->flags))
+               ret = rmi_dev->driver->reset_handler(rmi_dev);
 
-       return 0;
+       return ret;
 }
 
 static void rmi_reset_work(struct work_struct *work)
@@ -399,102 +312,22 @@ static void rmi_reset_work(struct work_struct *work)
        rmi_reset_attn_mode(hdata->hdev);
 }
 
-static inline int rmi_schedule_reset(struct hid_device *hdev)
-{
-       struct rmi_data *hdata = hid_get_drvdata(hdev);
-       return schedule_work(&hdata->reset_work);
-}
-
-static int rmi_f11_input_event(struct hid_device *hdev, u8 irq, u8 *data,
-               int size)
-{
-       struct rmi_data *hdata = hid_get_drvdata(hdev);
-       int offset;
-       int i;
-
-       if (!(irq & hdata->f11.irq_mask) || size <= 0)
-               return 0;
-
-       offset = (hdata->max_fingers >> 2) + 1;
-       for (i = 0; i < hdata->max_fingers; i++) {
-               int fs_byte_position = i >> 2;
-               int fs_bit_position = (i & 0x3) << 1;
-               int finger_state = (data[fs_byte_position] >> fs_bit_position) &
-                                       0x03;
-               int position = offset + 5 * i;
-
-               if (position + 5 > size) {
-                       /* partial report, go on with what we received */
-                       printk_once(KERN_WARNING
-                               "%s %s: Detected incomplete finger report. Finger reports may occasionally get dropped on this platform.\n",
-                                dev_driver_string(&hdev->dev),
-                                dev_name(&hdev->dev));
-                       hid_dbg(hdev, "Incomplete finger report\n");
-                       break;
-               }
-
-               rmi_f11_process_touch(hdata, i, finger_state, &data[position]);
-       }
-       input_mt_sync_frame(hdata->input);
-       input_sync(hdata->input);
-       return hdata->f11.report_size;
-}
-
-static int rmi_f30_input_event(struct hid_device *hdev, u8 irq, u8 *data,
-               int size)
+static int rmi_input_event(struct hid_device *hdev, u8 *data, int size)
 {
        struct rmi_data *hdata = hid_get_drvdata(hdev);
-       int i;
-       int button = 0;
-       bool value;
+       struct rmi_device *rmi_dev = hdata->xport.rmi_dev;
+       unsigned long flags;
 
-       if (!(irq & hdata->f30.irq_mask))
+       if (!(test_bit(RMI_STARTED, &hdata->flags)))
                return 0;
 
-       if (size < (int)hdata->f30.report_size) {
-               hid_warn(hdev, "Click Button pressed, but the click data is missing\n");
-               return 0;
-       }
+       local_irq_save(flags);
 
-       for (i = 0; i < hdata->gpio_led_count; i++) {
-               if (test_bit(i, &hdata->button_mask)) {
-                       value = (data[i / 8] >> (i & 0x07)) & BIT(0);
-                       if (test_bit(i, &hdata->button_state_mask))
-                               value = !value;
-                       input_event(hdata->input, EV_KEY, BTN_LEFT + button++,
-                                       value);
-               }
-       }
-       return hdata->f30.report_size;
-}
-
-static int rmi_input_event(struct hid_device *hdev, u8 *data, int size)
-{
-       struct rmi_data *hdata = hid_get_drvdata(hdev);
-       unsigned long irq_mask = 0;
-       unsigned index = 2;
+       rmi_set_attn_data(rmi_dev, data[1], &data[2], size - 2);
 
-       if (!(test_bit(RMI_STARTED, &hdata->flags)))
-               return 0;
+       generic_handle_irq(hdata->rmi_irq);
 
-       irq_mask |= hdata->f11.irq_mask;
-       irq_mask |= hdata->f30.irq_mask;
-
-       if (data[1] & ~irq_mask)
-               hid_dbg(hdev, "unknown intr source:%02lx %s:%d\n",
-                       data[1] & ~irq_mask, __FILE__, __LINE__);
-
-       if (hdata->f11.interrupt_base < hdata->f30.interrupt_base) {
-               index += rmi_f11_input_event(hdev, data[1], &data[index],
-                               size - index);
-               index += rmi_f30_input_event(hdev, data[1], &data[index],
-                               size - index);
-       } else {
-               index += rmi_f30_input_event(hdev, data[1], &data[index],
-                               size - index);
-               index += rmi_f11_input_event(hdev, data[1], &data[index],
-                               size - index);
-       }
+       local_irq_restore(flags);
 
        return 1;
 }
@@ -568,7 +401,7 @@ static int rmi_event(struct hid_device *hdev, struct hid_field *field,
                                return 1;
                }
 
-               rmi_schedule_reset(hdev);
+               schedule_work(&data->reset_work);
                return 1;
        }
 
@@ -576,637 +409,71 @@ static int rmi_event(struct hid_device *hdev, struct hid_field *field,
 }
 
 #ifdef CONFIG_PM
-static int rmi_set_sleep_mode(struct hid_device *hdev, int sleep_mode)
-{
-       struct rmi_data *data = hid_get_drvdata(hdev);
-       int ret;
-       u8 f01_ctrl0;
-
-       f01_ctrl0 = (data->f01_ctrl0 & ~0x3) | sleep_mode;
-
-       ret = rmi_write(hdev, data->f01.control_base_addr,
-                       &f01_ctrl0);
-       if (ret) {
-               hid_err(hdev, "can not write sleep mode\n");
-               return ret;
-       }
-
-       return 0;
-}
-
 static int rmi_suspend(struct hid_device *hdev, pm_message_t message)
 {
        struct rmi_data *data = hid_get_drvdata(hdev);
-       int ret;
-       u8 buf[RMI_F11_CTRL_REG_COUNT];
-
-       if (!(data->device_flags & RMI_DEVICE))
-               return 0;
-
-       ret = rmi_read_block(hdev, data->f11.control_base_addr, buf,
-                               RMI_F11_CTRL_REG_COUNT);
-       if (ret)
-               hid_warn(hdev, "can not read F11 control registers\n");
-       else
-               memcpy(data->f11_ctrl_regs, buf, RMI_F11_CTRL_REG_COUNT);
-
-
-       if (!device_may_wakeup(hdev->dev.parent))
-               return rmi_set_sleep_mode(hdev, RMI_SLEEP_DEEP_SLEEP);
-
-       return 0;
-}
-
-static int rmi_post_reset(struct hid_device *hdev)
-{
-       struct rmi_data *data = hid_get_drvdata(hdev);
+       struct rmi_device *rmi_dev = data->xport.rmi_dev;
        int ret;
 
        if (!(data->device_flags & RMI_DEVICE))
                return 0;
 
-       ret = rmi_reset_attn_mode(hdev);
+       ret = rmi_driver_suspend(rmi_dev, false);
        if (ret) {
-               hid_err(hdev, "can not set rmi mode\n");
+               hid_warn(hdev, "Failed to suspend device: %d\n", ret);
                return ret;
        }
 
-       if (data->read_f11_ctrl_regs) {
-               ret = rmi_write_block(hdev, data->f11.control_base_addr,
-                               data->f11_ctrl_regs, RMI_F11_CTRL_REG_COUNT);
-               if (ret)
-                       hid_warn(hdev,
-                               "can not write F11 control registers after reset\n");
-       }
-
-       if (!device_may_wakeup(hdev->dev.parent)) {
-               ret = rmi_set_sleep_mode(hdev, RMI_SLEEP_NORMAL);
-               if (ret) {
-                       hid_err(hdev, "can not write sleep mode\n");
-                       return ret;
-               }
-       }
-
-       return ret;
+       return 0;
 }
 
 static int rmi_post_resume(struct hid_device *hdev)
 {
        struct rmi_data *data = hid_get_drvdata(hdev);
+       struct rmi_device *rmi_dev = data->xport.rmi_dev;
+       int ret;
 
        if (!(data->device_flags & RMI_DEVICE))
                return 0;
 
-       return rmi_reset_attn_mode(hdev);
-}
-#endif /* CONFIG_PM */
-
-#define RMI4_MAX_PAGE 0xff
-#define RMI4_PAGE_SIZE 0x0100
-
-#define PDT_START_SCAN_LOCATION 0x00e9
-#define PDT_END_SCAN_LOCATION  0x0005
-#define RMI4_END_OF_PDT(id) ((id) == 0x00 || (id) == 0xff)
-
-struct pdt_entry {
-       u8 query_base_addr:8;
-       u8 command_base_addr:8;
-       u8 control_base_addr:8;
-       u8 data_base_addr:8;
-       u8 interrupt_source_count:3;
-       u8 bits3and4:2;
-       u8 function_version:2;
-       u8 bit7:1;
-       u8 function_number:8;
-} __attribute__((__packed__));
-
-static inline unsigned long rmi_gen_mask(unsigned irq_base, unsigned irq_count)
-{
-       return GENMASK(irq_count + irq_base - 1, irq_base);
-}
-
-static void rmi_register_function(struct rmi_data *data,
-       struct pdt_entry *pdt_entry, int page, unsigned interrupt_count)
-{
-       struct rmi_function *f = NULL;
-       u16 page_base = page << 8;
-
-       switch (pdt_entry->function_number) {
-       case 0x01:
-               f = &data->f01;
-               break;
-       case 0x11:
-               f = &data->f11;
-               break;
-       case 0x30:
-               f = &data->f30;
-               break;
-       }
-
-       if (f) {
-               f->page = page;
-               f->query_base_addr = page_base | pdt_entry->query_base_addr;
-               f->command_base_addr = page_base | pdt_entry->command_base_addr;
-               f->control_base_addr = page_base | pdt_entry->control_base_addr;
-               f->data_base_addr = page_base | pdt_entry->data_base_addr;
-               f->interrupt_base = interrupt_count;
-               f->interrupt_count = pdt_entry->interrupt_source_count;
-               f->irq_mask = rmi_gen_mask(f->interrupt_base,
-                                               f->interrupt_count);
-               data->interrupt_enable_mask |= f->irq_mask;
-       }
-}
-
-static int rmi_scan_pdt(struct hid_device *hdev)
-{
-       struct rmi_data *data = hid_get_drvdata(hdev);
-       struct pdt_entry entry;
-       int page;
-       bool page_has_function;
-       int i;
-       int retval;
-       int interrupt = 0;
-       u16 page_start, pdt_start , pdt_end;
-
-       hid_info(hdev, "Scanning PDT...\n");
-
-       for (page = 0; (page <= RMI4_MAX_PAGE); page++) {
-               page_start = RMI4_PAGE_SIZE * page;
-               pdt_start = page_start + PDT_START_SCAN_LOCATION;
-               pdt_end = page_start + PDT_END_SCAN_LOCATION;
-
-               page_has_function = false;
-               for (i = pdt_start; i >= pdt_end; i -= sizeof(entry)) {
-                       retval = rmi_read_block(hdev, i, &entry, sizeof(entry));
-                       if (retval) {
-                               hid_err(hdev,
-                                       "Read of PDT entry at %#06x failed.\n",
-                                       i);
-                               goto error_exit;
-                       }
-
-                       if (RMI4_END_OF_PDT(entry.function_number))
-                               break;
-
-                       page_has_function = true;
-
-                       hid_info(hdev, "Found F%02X on page %#04x\n",
-                                       entry.function_number, page);
-
-                       rmi_register_function(data, &entry, page, interrupt);
-                       interrupt += entry.interrupt_source_count;
-               }
-
-               if (!page_has_function)
-                       break;
-       }
-
-       hid_info(hdev, "%s: Done with PDT scan.\n", __func__);
-       retval = 0;
-
-error_exit:
-       return retval;
-}
-
-#define RMI_DEVICE_F01_BASIC_QUERY_LEN 11
-
-static int rmi_populate_f01(struct hid_device *hdev)
-{
-       struct rmi_data *data = hid_get_drvdata(hdev);
-       u8 basic_queries[RMI_DEVICE_F01_BASIC_QUERY_LEN];
-       u8 info[3];
-       int ret;
-       bool has_query42;
-       bool has_lts;
-       bool has_sensor_id;
-       bool has_ds4_queries = false;
-       bool has_build_id_query = false;
-       bool has_package_id_query = false;
-       u16 query_offset = data->f01.query_base_addr;
-       u16 prod_info_addr;
-       u8 ds4_query_len;
-
-       ret = rmi_read_block(hdev, query_offset, basic_queries,
-                               RMI_DEVICE_F01_BASIC_QUERY_LEN);
-       if (ret) {
-               hid_err(hdev, "Can not read basic queries from Function 0x1.\n");
-               return ret;
-       }
-
-       has_lts = !!(basic_queries[0] & BIT(2));
-       has_sensor_id = !!(basic_queries[1] & BIT(3));
-       has_query42 = !!(basic_queries[1] & BIT(7));
-
-       query_offset += 11;
-       prod_info_addr = query_offset + 6;
-       query_offset += 10;
-
-       if (has_lts)
-               query_offset += 20;
-
-       if (has_sensor_id)
-               query_offset++;
-
-       if (has_query42) {
-               ret = rmi_read(hdev, query_offset, info);
-               if (ret) {
-                       hid_err(hdev, "Can not read query42.\n");
-                       return ret;
-               }
-               has_ds4_queries = !!(info[0] & BIT(0));
-               query_offset++;
-       }
-
-       if (has_ds4_queries) {
-               ret = rmi_read(hdev, query_offset, &ds4_query_len);
-               if (ret) {
-                       hid_err(hdev, "Can not read DS4 Query length.\n");
-                       return ret;
-               }
-               query_offset++;
-
-               if (ds4_query_len > 0) {
-                       ret = rmi_read(hdev, query_offset, info);
-                       if (ret) {
-                               hid_err(hdev, "Can not read DS4 query.\n");
-                               return ret;
-                       }
-
-                       has_package_id_query = !!(info[0] & BIT(0));
-                       has_build_id_query = !!(info[0] & BIT(1));
-               }
-       }
-
-       if (has_package_id_query)
-               prod_info_addr++;
-
-       if (has_build_id_query) {
-               ret = rmi_read_block(hdev, prod_info_addr, info, 3);
-               if (ret) {
-                       hid_err(hdev, "Can not read product info.\n");
-                       return ret;
-               }
-
-               data->firmware_id = info[1] << 8 | info[0];
-               data->firmware_id += info[2] * 65536;
-       }
-
-       ret = rmi_read_block(hdev, data->f01.control_base_addr, info,
-                               2);
-
-       if (ret) {
-               hid_err(hdev, "can not read f01 ctrl registers\n");
-               return ret;
-       }
-
-       data->f01_ctrl0 = info[0];
-
-       if (!info[1]) {
-               /*
-                * Do to a firmware bug in some touchpads the F01 interrupt
-                * enable control register will be cleared on reset.
-                * This will stop the touchpad from reporting data, so
-                * if F01 CTRL1 is 0 then we need to explicitly enable
-                * interrupts for the functions we want data for.
-                */
-               data->restore_interrupt_mask = true;
-
-               ret = rmi_write(hdev, data->f01.control_base_addr + 1,
-                               &data->interrupt_enable_mask);
-               if (ret) {
-                       hid_err(hdev, "can not write to control reg 1: %d.\n",
-                               ret);
-                       return ret;
-               }
-       }
-
-       return 0;
-}
-
-static int rmi_populate_f11(struct hid_device *hdev)
-{
-       struct rmi_data *data = hid_get_drvdata(hdev);
-       u8 buf[20];
-       int ret;
-       bool has_query9;
-       bool has_query10 = false;
-       bool has_query11;
-       bool has_query12;
-       bool has_query27;
-       bool has_query28;
-       bool has_query36 = false;
-       bool has_physical_props;
-       bool has_gestures;
-       bool has_rel;
-       bool has_data40 = false;
-       bool has_dribble = false;
-       bool has_palm_detect = false;
-       unsigned x_size, y_size;
-       u16 query_offset;
-
-       if (!data->f11.query_base_addr) {
-               hid_err(hdev, "No 2D sensor found, giving up.\n");
-               return -ENODEV;
-       }
-
-       /* query 0 contains some useful information */
-       ret = rmi_read(hdev, data->f11.query_base_addr, buf);
-       if (ret) {
-               hid_err(hdev, "can not get query 0: %d.\n", ret);
-               return ret;
-       }
-       has_query9 = !!(buf[0] & BIT(3));
-       has_query11 = !!(buf[0] & BIT(4));
-       has_query12 = !!(buf[0] & BIT(5));
-       has_query27 = !!(buf[0] & BIT(6));
-       has_query28 = !!(buf[0] & BIT(7));
-
-       /* query 1 to get the max number of fingers */
-       ret = rmi_read(hdev, data->f11.query_base_addr + 1, buf);
-       if (ret) {
-               hid_err(hdev, "can not get NumberOfFingers: %d.\n", ret);
-               return ret;
-       }
-       data->max_fingers = (buf[0] & 0x07) + 1;
-       if (data->max_fingers > 5)
-               data->max_fingers = 10;
-
-       data->f11.report_size = data->max_fingers * 5 +
-                               DIV_ROUND_UP(data->max_fingers, 4);
-
-       if (!(buf[0] & BIT(4))) {
-               hid_err(hdev, "No absolute events, giving up.\n");
-               return -ENODEV;
-       }
-
-       has_rel = !!(buf[0] & BIT(3));
-       has_gestures = !!(buf[0] & BIT(5));
-
-       ret = rmi_read(hdev, data->f11.query_base_addr + 5, buf);
-       if (ret) {
-               hid_err(hdev, "can not get absolute data sources: %d.\n", ret);
+       ret = rmi_reset_attn_mode(hdev);
+       if (ret)
                return ret;
-       }
-
-       has_dribble = !!(buf[0] & BIT(4));
-
-       /*
-        * At least 4 queries are guaranteed to be present in F11
-        * +1 for query 5 which is present since absolute events are
-        * reported and +1 for query 12.
-        */
-       query_offset = 6;
-
-       if (has_rel)
-               ++query_offset; /* query 6 is present */
-
-       if (has_gestures) {
-               /* query 8 to find out if query 10 exists */
-               ret = rmi_read(hdev,
-                       data->f11.query_base_addr + query_offset + 1, buf);
-               if (ret) {
-                       hid_err(hdev, "can not read gesture information: %d.\n",
-                               ret);
-                       return ret;
-               }
-               has_palm_detect = !!(buf[0] & BIT(0));
-               has_query10 = !!(buf[0] & BIT(2));
-
-               query_offset += 2; /* query 7 and 8 are present */
-       }
-
-       if (has_query9)
-               ++query_offset;
-
-       if (has_query10)
-               ++query_offset;
-
-       if (has_query11)
-               ++query_offset;
-
-       /* query 12 to know if the physical properties are reported */
-       if (has_query12) {
-               ret = rmi_read(hdev, data->f11.query_base_addr
-                               + query_offset, buf);
-               if (ret) {
-                       hid_err(hdev, "can not get query 12: %d.\n", ret);
-                       return ret;
-               }
-               has_physical_props = !!(buf[0] & BIT(5));
-
-               if (has_physical_props) {
-                       query_offset += 1;
-                       ret = rmi_read_block(hdev,
-                                       data->f11.query_base_addr
-                                               + query_offset, buf, 4);
-                       if (ret) {
-                               hid_err(hdev, "can not read query 15-18: %d.\n",
-                                       ret);
-                               return ret;
-                       }
-
-                       x_size = buf[0] | (buf[1] << 8);
-                       y_size = buf[2] | (buf[3] << 8);
-
-                       data->x_size_mm = DIV_ROUND_CLOSEST(x_size, 10);
-                       data->y_size_mm = DIV_ROUND_CLOSEST(y_size, 10);
-
-                       hid_info(hdev, "%s: size in mm: %d x %d\n",
-                                __func__, data->x_size_mm, data->y_size_mm);
-
-                       /*
-                        * query 15 - 18 contain the size of the sensor
-                        * and query 19 - 26 contain bezel dimensions
-                        */
-                       query_offset += 12;
-               }
-       }
-
-       if (has_query27)
-               ++query_offset;
 
-       if (has_query28) {
-               ret = rmi_read(hdev, data->f11.query_base_addr
-                               + query_offset, buf);
-               if (ret) {
-                       hid_err(hdev, "can not get query 28: %d.\n", ret);
-                       return ret;
-               }
-
-               has_query36 = !!(buf[0] & BIT(6));
-       }
-
-       if (has_query36) {
-               query_offset += 2;
-               ret = rmi_read(hdev, data->f11.query_base_addr
-                               + query_offset, buf);
-               if (ret) {
-                       hid_err(hdev, "can not get query 36: %d.\n", ret);
-                       return ret;
-               }
-
-               has_data40 = !!(buf[0] & BIT(5));
-       }
-
-
-       if (has_data40)
-               data->f11.report_size += data->max_fingers * 2;
-
-       ret = rmi_read_block(hdev, data->f11.control_base_addr,
-                       data->f11_ctrl_regs, RMI_F11_CTRL_REG_COUNT);
+       ret = rmi_driver_resume(rmi_dev, false);
        if (ret) {
-               hid_err(hdev, "can not read ctrl block of size 11: %d.\n", ret);
+               hid_warn(hdev, "Failed to resume device: %d\n", ret);
                return ret;
        }
 
-       /* data->f11_ctrl_regs now contains valid register data */
-       data->read_f11_ctrl_regs = true;
-
-       data->max_x = data->f11_ctrl_regs[6] | (data->f11_ctrl_regs[7] << 8);
-       data->max_y = data->f11_ctrl_regs[8] | (data->f11_ctrl_regs[9] << 8);
-
-       if (has_dribble) {
-               data->f11_ctrl_regs[0] = data->f11_ctrl_regs[0] & ~BIT(6);
-               ret = rmi_write(hdev, data->f11.control_base_addr,
-                               data->f11_ctrl_regs);
-               if (ret) {
-                       hid_err(hdev, "can not write to control reg 0: %d.\n",
-                               ret);
-                       return ret;
-               }
-       }
-
-       if (has_palm_detect) {
-               data->f11_ctrl_regs[11] = data->f11_ctrl_regs[11] & ~BIT(0);
-               ret = rmi_write(hdev, data->f11.control_base_addr + 11,
-                               &data->f11_ctrl_regs[11]);
-               if (ret) {
-                       hid_err(hdev, "can not write to control reg 11: %d.\n",
-                               ret);
-                       return ret;
-               }
-       }
-
-       return 0;
-}
-
-static int rmi_populate_f30(struct hid_device *hdev)
-{
-       struct rmi_data *data = hid_get_drvdata(hdev);
-       u8 buf[20];
-       int ret;
-       bool has_gpio, has_led;
-       unsigned bytes_per_ctrl;
-       u8 ctrl2_addr;
-       int ctrl2_3_length;
-       int i;
-
-       /* function F30 is for physical buttons */
-       if (!data->f30.query_base_addr) {
-               hid_err(hdev, "No GPIO/LEDs found, giving up.\n");
-               return -ENODEV;
-       }
-
-       ret = rmi_read_block(hdev, data->f30.query_base_addr, buf, 2);
-       if (ret) {
-               hid_err(hdev, "can not get F30 query registers: %d.\n", ret);
-               return ret;
-       }
-
-       has_gpio = !!(buf[0] & BIT(3));
-       has_led = !!(buf[0] & BIT(2));
-       data->gpio_led_count = buf[1] & 0x1f;
-
-       /* retrieve ctrl 2 & 3 registers */
-       bytes_per_ctrl = (data->gpio_led_count + 7) / 8;
-       /* Ctrl0 is present only if both has_gpio and has_led are set*/
-       ctrl2_addr = (has_gpio && has_led) ? bytes_per_ctrl : 0;
-       /* Ctrl1 is always be present */
-       ctrl2_addr += bytes_per_ctrl;
-       ctrl2_3_length = 2 * bytes_per_ctrl;
-
-       data->f30.report_size = bytes_per_ctrl;
-
-       ret = rmi_read_block(hdev, data->f30.control_base_addr + ctrl2_addr,
-                               buf, ctrl2_3_length);
-       if (ret) {
-               hid_err(hdev, "can not read ctrl 2&3 block of size %d: %d.\n",
-                       ctrl2_3_length, ret);
-               return ret;
-       }
-
-       for (i = 0; i < data->gpio_led_count; i++) {
-               int byte_position = i >> 3;
-               int bit_position = i & 0x07;
-               u8 dir_byte = buf[byte_position];
-               u8 data_byte = buf[byte_position + bytes_per_ctrl];
-               bool dir = (dir_byte >> bit_position) & BIT(0);
-               bool dat = (data_byte >> bit_position) & BIT(0);
-
-               if (dir == 0) {
-                       /* input mode */
-                       if (dat) {
-                               /* actual buttons have pull up resistor */
-                               data->button_count++;
-                               set_bit(i, &data->button_mask);
-                               set_bit(i, &data->button_state_mask);
-                       }
-               }
-
-       }
-
        return 0;
 }
+#endif /* CONFIG_PM */
 
-static int rmi_populate(struct hid_device *hdev)
+static int rmi_hid_reset(struct rmi_transport_dev *xport, u16 reset_addr)
 {
-       struct rmi_data *data = hid_get_drvdata(hdev);
-       int ret;
-
-       ret = rmi_scan_pdt(hdev);
-       if (ret) {
-               hid_err(hdev, "PDT scan failed with code %d.\n", ret);
-               return ret;
-       }
-
-       ret = rmi_populate_f01(hdev);
-       if (ret) {
-               hid_err(hdev, "Error while initializing F01 (%d).\n", ret);
-               return ret;
-       }
-
-       ret = rmi_populate_f11(hdev);
-       if (ret) {
-               hid_err(hdev, "Error while initializing F11 (%d).\n", ret);
-               return ret;
-       }
-
-       if (!(data->device_flags & RMI_DEVICE_HAS_PHYS_BUTTONS)) {
-               ret = rmi_populate_f30(hdev);
-               if (ret)
-                       hid_warn(hdev, "Error while initializing F30 (%d).\n", ret);
-       }
+       struct rmi_data *data = container_of(xport, struct rmi_data, xport);
+       struct hid_device *hdev = data->hdev;
 
-       return 0;
+       return rmi_reset_attn_mode(hdev);
 }
 
 static int rmi_input_configured(struct hid_device *hdev, struct hid_input *hi)
 {
        struct rmi_data *data = hid_get_drvdata(hdev);
        struct input_dev *input = hi->input;
-       int ret;
-       int res_x, res_y, i;
+       int ret = 0;
+
+       if (!(data->device_flags & RMI_DEVICE))
+               return 0;
 
-       data->input = input;
+       data->xport.input = input;
 
        hid_dbg(hdev, "Opening low level driver\n");
        ret = hid_hw_open(hdev);
        if (ret)
                return ret;
 
-       if (!(data->device_flags & RMI_DEVICE))
-               return 0;
-
        /* Allow incoming hid reports */
        hid_device_io_start(hdev);
 
@@ -1222,40 +489,10 @@ static int rmi_input_configured(struct hid_device *hdev, struct hid_input *hi)
                goto exit;
        }
 
-       ret = rmi_populate(hdev);
-       if (ret)
-               goto exit;
-
-       hid_info(hdev, "firmware id: %ld\n", data->firmware_id);
-
-       __set_bit(EV_ABS, input->evbit);
-       input_set_abs_params(input, ABS_MT_POSITION_X, 1, data->max_x, 0, 0);
-       input_set_abs_params(input, ABS_MT_POSITION_Y, 1, data->max_y, 0, 0);
-
-       if (data->x_size_mm && data->y_size_mm) {
-               res_x = (data->max_x - 1) / data->x_size_mm;
-               res_y = (data->max_y - 1) / data->y_size_mm;
-
-               input_abs_set_res(input, ABS_MT_POSITION_X, res_x);
-               input_abs_set_res(input, ABS_MT_POSITION_Y, res_y);
-       }
-
-       input_set_abs_params(input, ABS_MT_ORIENTATION, 0, 1, 0, 0);
-       input_set_abs_params(input, ABS_MT_PRESSURE, 0, 0xff, 0, 0);
-       input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0, 0x0f, 0, 0);
-       input_set_abs_params(input, ABS_MT_TOUCH_MINOR, 0, 0x0f, 0, 0);
-
-       ret = input_mt_init_slots(input, data->max_fingers, INPUT_MT_POINTER);
-       if (ret < 0)
+       ret = rmi_register_transport_device(&data->xport);
+       if (ret < 0) {
+               dev_err(&hdev->dev, "failed to register transport driver\n");
                goto exit;
-
-       if (data->button_count) {
-               __set_bit(EV_KEY, input->evbit);
-               for (i = 0; i < data->button_count; i++)
-                       __set_bit(BTN_LEFT + i, input->keybit);
-
-               if (data->button_count == 1)
-                       __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
        }
 
        set_bit(RMI_STARTED, &data->flags);
@@ -1304,6 +541,71 @@ static int rmi_check_valid_report_id(struct hid_device *hdev, unsigned type,
        return 0;
 }
 
+static struct rmi_device_platform_data rmi_hid_pdata = {
+       .sensor_pdata = {
+               .sensor_type = rmi_sensor_touchpad,
+               .axis_align.flip_y = true,
+               .dribble = RMI_REG_STATE_ON,
+               .palm_detect = RMI_REG_STATE_OFF,
+       },
+};
+
+static const struct rmi_transport_ops hid_rmi_ops = {
+       .write_block    = rmi_hid_write_block,
+       .read_block     = rmi_hid_read_block,
+       .reset          = rmi_hid_reset,
+};
+
+static void rmi_irq_teardown(void *data)
+{
+       struct rmi_data *hdata = data;
+       struct irq_domain *domain = hdata->domain;
+
+       if (!domain)
+               return;
+
+       irq_dispose_mapping(irq_find_mapping(domain, 0));
+
+       irq_domain_remove(domain);
+       hdata->domain = NULL;
+       hdata->rmi_irq = 0;
+}
+
+static int rmi_irq_map(struct irq_domain *h, unsigned int virq,
+                      irq_hw_number_t hw_irq_num)
+{
+       irq_set_chip_and_handler(virq, &dummy_irq_chip, handle_simple_irq);
+
+       return 0;
+}
+
+static const struct irq_domain_ops rmi_irq_ops = {
+       .map = rmi_irq_map,
+};
+
+static int rmi_setup_irq_domain(struct hid_device *hdev)
+{
+       struct rmi_data *hdata = hid_get_drvdata(hdev);
+       int ret;
+
+       hdata->domain = irq_domain_create_linear(hdev->dev.fwnode, 1,
+                                                &rmi_irq_ops, hdata);
+       if (!hdata->domain)
+               return -ENOMEM;
+
+       ret = devm_add_action_or_reset(&hdev->dev, &rmi_irq_teardown, hdata);
+       if (ret)
+               return ret;
+
+       hdata->rmi_irq = irq_create_mapping(hdata->domain, 0);
+       if (hdata->rmi_irq <= 0) {
+               hid_err(hdev, "Can't allocate an IRQ\n");
+               return hdata->rmi_irq < 0 ? hdata->rmi_irq : -ENXIO;
+       }
+
+       return 0;
+}
+
 static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
 {
        struct rmi_data *data = NULL;
@@ -1365,8 +667,8 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
        data->writeReport = devm_kzalloc(&hdev->dev, alloc_size, GFP_KERNEL);
        if (!data->writeReport) {
-               ret = -ENOMEM;
-               return ret;
+               hid_err(hdev, "failed to allocate buffer for HID reports\n");
+               return -ENOMEM;
        }
 
        data->readReport = data->writeReport + data->output_report_size;
@@ -1375,6 +677,21 @@ static int rmi_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
        mutex_init(&data->page_mutex);
 
+       ret = rmi_setup_irq_domain(hdev);
+       if (ret) {
+               hid_err(hdev, "failed to allocate IRQ domain\n");
+               return ret;
+       }
+
+       if (data->device_flags & RMI_DEVICE_HAS_PHYS_BUTTONS)
+               rmi_hid_pdata.f30_data.disable = true;
+
+       data->xport.dev = hdev->dev.parent;
+       data->xport.pdata = rmi_hid_pdata;
+       data->xport.pdata.irq = data->rmi_irq;
+       data->xport.proto_name = "hid";
+       data->xport.ops = &hid_rmi_ops;
+
 start:
        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
        if (ret) {
@@ -1382,17 +699,6 @@ start:
                return ret;
        }
 
-       if ((data->device_flags & RMI_DEVICE) &&
-           !test_bit(RMI_STARTED, &data->flags))
-               /*
-                * The device maybe in the bootloader if rmi_input_configured
-                * failed to find F11 in the PDT. Print an error, but don't
-                * return an error from rmi_probe so that hidraw will be
-                * accessible from userspace. That way a userspace tool
-                * can be used to reload working firmware on the touchpad.
-                */
-               hid_err(hdev, "Device failed to be properly configured\n");
-
        return 0;
 }
 
@@ -1401,6 +707,8 @@ static void rmi_remove(struct hid_device *hdev)
        struct rmi_data *hdata = hid_get_drvdata(hdev);
 
        clear_bit(RMI_STARTED, &hdata->flags);
+       cancel_work_sync(&hdata->reset_work);
+       rmi_unregister_transport_device(&hdata->xport);
 
        hid_hw_stop(hdev);
 }
@@ -1408,6 +716,7 @@ static void rmi_remove(struct hid_device *hdev)
 static const struct hid_device_id rmi_id[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14),
                .driver_data = RMI_DEVICE_HAS_PHYS_BUTTONS },
+       { HID_USB_DEVICE(USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X1_COVER) },
        { HID_DEVICE(HID_BUS_ANY, HID_GROUP_RMI, HID_ANY_ID, HID_ANY_ID) },
        { }
 };
@@ -1425,7 +734,7 @@ static struct hid_driver rmi_driver = {
 #ifdef CONFIG_PM
        .suspend                = rmi_suspend,
        .resume                 = rmi_post_resume,
-       .reset_resume           = rmi_post_reset,
+       .reset_resume           = rmi_post_resume,
 #endif
 };
 
index ab68afc..a5897b9 100644 (file)
 #define IPC_ILUP_BIT                   (1<<IPC_ILUP_OFFS)
 
 /*
+ * ISH FW status bits in ISH FW Status Register
+ */
+#define IPC_ISH_FWSTS_SHIFT            12
+#define IPC_ISH_FWSTS_MASK             GENMASK(15, 12)
+#define IPC_GET_ISH_FWSTS(status)      \
+       (((status) & IPC_ISH_FWSTS_MASK) >> IPC_ISH_FWSTS_SHIFT)
+
+/*
  * FW status bits (relevant)
  */
 #define        IPC_FWSTS_ILUP          0x1
index 46615a0..fd34307 100644 (file)
@@ -61,6 +61,18 @@ struct ish_hw {
        void __iomem *mem_addr;
 };
 
+/*
+ * ISH FW status type
+ */
+enum {
+       FWSTS_AFTER_RESET               = 0,
+       FWSTS_WAIT_FOR_HOST             = 4,
+       FWSTS_START_KERNEL_DMA          = 5,
+       FWSTS_FW_IS_RUNNING             = 7,
+       FWSTS_SENSOR_APP_LOADED         = 8,
+       FWSTS_SENSOR_APP_RUNNING        = 15
+};
+
 #define to_ish_hw(dev) (struct ish_hw *)((dev)->hw)
 
 irqreturn_t ish_irq_handler(int irq, void *dev_id);
index 20d647d..8df81dc 100644 (file)
@@ -24,7 +24,6 @@
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/workqueue.h>
-#include <linux/miscdevice.h>
 #define CREATE_TRACE_POINTS
 #include <trace/events/intel_ish.h>
 #include "ishtp-dev.h"
@@ -47,7 +46,8 @@ MODULE_DEVICE_TABLE(pci, ish_pci_tbl);
  *
  * Callback to direct log messages to Linux trace buffers
  */
-static void ish_event_tracer(struct ishtp_device *dev, char *format, ...)
+static __printf(2, 3)
+void ish_event_tracer(struct ishtp_device *dev, const char *format, ...)
 {
        if (trace_ishtp_dump_enabled()) {
                va_list args;
@@ -205,12 +205,15 @@ static void ish_remove(struct pci_dev *pdev)
 #ifdef CONFIG_PM
 static struct device *ish_resume_device;
 
+/* 50ms to get resume response */
+#define WAIT_FOR_RESUME_ACK_MS         50
+
 /**
  * ish_resume_handler() - Work function to complete resume
  * @work:      work struct
  *
  * The resume work function to complete resume function asynchronously.
- * There are two types of platforms, one where ISH is not powered off,
+ * There are two resume paths, one where ISH is not powered off,
  * in that case a simple resume message is enough, others we need
  * a reset sequence.
  */
@@ -218,20 +221,31 @@ static void ish_resume_handler(struct work_struct *work)
 {
        struct pci_dev *pdev = to_pci_dev(ish_resume_device);
        struct ishtp_device *dev = pci_get_drvdata(pdev);
+       uint32_t fwsts;
        int ret;
 
-       ishtp_send_resume(dev);
+       /* Get ISH FW status */
+       fwsts = IPC_GET_ISH_FWSTS(dev->ops->get_fw_status(dev));
 
-       /* 50 ms to get resume response */
-       if (dev->resume_flag)
-               ret = wait_event_interruptible_timeout(dev->resume_wait,
-                                                      !dev->resume_flag,
-                                                      msecs_to_jiffies(50));
+       /*
+        * If currently, in ISH FW, sensor app is loaded or beyond that,
+        * it means ISH isn't powered off, in this case, send a resume message.
+        */
+       if (fwsts >= FWSTS_SENSOR_APP_LOADED) {
+               ishtp_send_resume(dev);
+
+               /* Waiting to get resume response */
+               if (dev->resume_flag)
+                       ret = wait_event_interruptible_timeout(dev->resume_wait,
+                               !dev->resume_flag,
+                               msecs_to_jiffies(WAIT_FOR_RESUME_ACK_MS));
+       }
 
        /*
-        * If no resume response. This platform  is not S0ix compatible
-        * So on resume full reboot of ISH processor will happen, so
-        * need to go through init sequence again
+        * If in ISH FW, sensor app isn't loaded yet, or no resume response.
+        * That means this platform is not S0ix compatible, or something is
+        * wrong with ISH FW. So on resume, full reboot of ISH processor will
+        * happen, so need to go through init sequence again.
         */
        if (dev->resume_flag)
                ish_init(dev);
index 277983a..cd23903 100644 (file)
@@ -208,7 +208,7 @@ int ishtp_hid_probe(unsigned int cur_hid_dev,
        hid->version = le16_to_cpu(ISH_HID_VERSION);
        hid->vendor = le16_to_cpu(ISH_HID_VENDOR);
        hid->product = le16_to_cpu(ISH_HID_PRODUCT);
-       snprintf(hid->name, sizeof(hid->name), "%s %04hX:%04hX", "hid-ishtp",
+       snprintf(hid->name, sizeof(hid->name), "%s %04X:%04X", "hid-ishtp",
                hid->vendor, hid->product);
 
        rv = hid_add_device(hid);
index f4cbc74..5f382fe 100644 (file)
@@ -358,7 +358,7 @@ static void ishtp_cl_dev_release(struct device *dev)
        kfree(to_ishtp_cl_device(dev));
 }
 
-static struct device_type ishtp_cl_device_type = {
+static const struct device_type ishtp_cl_device_type = {
        .release        = ishtp_cl_dev_release,
 };
 
index 59460b6..b721360 100644 (file)
@@ -19,7 +19,6 @@
 #include <linux/sched.h>
 #include <linux/wait.h>
 #include <linux/spinlock.h>
-#include <linux/miscdevice.h>
 #include "ishtp-dev.h"
 #include "hbm.h"
 #include "client.h"
index ac36441..d27e035 100644 (file)
@@ -16,7 +16,6 @@
 #include <linux/export.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
-#include <linux/miscdevice.h>
 #include "ishtp-dev.h"
 #include "hbm.h"
 #include "client.h"
index a94f9a8..6a6d927 100644 (file)
@@ -238,7 +238,8 @@ struct ishtp_device {
        uint64_t ishtp_host_dma_rx_buf_phys;
 
        /* Dump to trace buffers if enabled*/
-       void (*print_log)(struct ishtp_device *dev, char *format, ...);
+       __printf(2, 3) void (*print_log)(struct ishtp_device *dev,
+                                        const char *format, ...);
 
        /* Debug stats */
        unsigned int    ipc_rx_cnt;
index 333108e..961bc6f 100644 (file)
@@ -43,7 +43,6 @@
  */
 
 #define DRIVER_DESC "USB HID core driver"
-#define DRIVER_LICENSE "GPL"
 
 /*
  * Module parameters.
@@ -1660,4 +1659,4 @@ MODULE_AUTHOR("Andreas Gal");
 MODULE_AUTHOR("Vojtech Pavlik");
 MODULE_AUTHOR("Jiri Kosina");
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_LICENSE("GPL");
index e9d6cc7..d6847a6 100644 (file)
@@ -57,6 +57,7 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_AIREN, USB_DEVICE_ID_AIREN_SLIMPLUS, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_AKAI, USB_DEVICE_ID_AKAI_MPKMINI2, HID_QUIRK_NO_INIT_REPORTS },
        { USB_VENDOR_ID_AKAI_09E8, USB_DEVICE_ID_AKAI_09E8_MIDIMIX, HID_QUIRK_NO_INIT_REPORTS },
+       { USB_VENDOR_ID_AMI, USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE, HID_QUIRK_ALWAYS_POLL },
        { 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 },
@@ -84,7 +85,7 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_DOLPHINBAR, HID_QUIRK_MULTI_INPUT },
-       { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE, HID_QUIRK_MULTI_INPUT },
+       { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE1, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_ELAN, HID_ANY_ID, HID_QUIRK_ALWAYS_POLL },
        { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
        { USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },
@@ -102,12 +103,6 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_PRO_2, HID_QUIRK_NO_INIT_REPORTS },
        { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2, HID_QUIRK_NO_INIT_REPORTS },
        { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TOUCH_COVER_2, HID_QUIRK_NO_INIT_REPORTS },
-       { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3, HID_QUIRK_NO_INIT_REPORTS },
-       { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2, HID_QUIRK_NO_INIT_REPORTS },
-       { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP, HID_QUIRK_NO_INIT_REPORTS },
-       { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4, HID_QUIRK_NO_INIT_REPORTS },
-       { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2, HID_QUIRK_NO_INIT_REPORTS },
-       { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP, HID_QUIRK_NO_INIT_REPORTS },
        { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS },
        { USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS },
        { USB_VENDOR_ID_NEXIO, USB_DEVICE_ID_NEXIO_MULTITOUCH_PTI0750, HID_QUIRK_NO_INIT_REPORTS },
@@ -296,7 +291,7 @@ static void usbhid_remove_all_dquirks(void)
 
 }
 
-/** 
+/**
  * usbhid_quirks_init: apply USB HID quirks specified at module load time
  */
 int usbhid_quirks_init(char **quirks_param)
@@ -360,7 +355,7 @@ static const struct hid_blacklist *usbhid_exists_squirk(const u16 idVendor,
 
        if (bl_entry != NULL)
                dbg_hid("Found squirk 0x%x for USB HID vendor 0x%hx prod 0x%hx\n",
-                               bl_entry->quirks, bl_entry->idVendor, 
+                               bl_entry->quirks, bl_entry->idVendor,
                                bl_entry->idProduct);
        return bl_entry;
 }
index 9a332e6..7fb2d1e 100644 (file)
 #define DRIVER_VERSION ""
 #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"
 #define DRIVER_DESC "USB HID Boot Protocol keyboard driver"
-#define DRIVER_LICENSE "GPL"
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_LICENSE("GPL");
 
 static const unsigned char usb_kbd_keycode[256] = {
          0,  0,  0,  0, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38,
index bf16d72..dd911c5 100644 (file)
 #define DRIVER_VERSION "v1.6"
 #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"
 #define DRIVER_DESC "USB HID Boot Protocol mouse driver"
-#define DRIVER_LICENSE "GPL"
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_LICENSE("GPL");
 
 struct usb_mouse {
        char name[128];
index d0d7dc1..38ee212 100644 (file)
 #define DRIVER_VERSION "v2.00"
 #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"
 #define DRIVER_DESC "USB Wacom tablet driver"
-#define DRIVER_LICENSE "GPL"
 
 #define USB_VENDOR_ID_WACOM    0x056a
 #define USB_VENDOR_ID_LENOVO   0x17ef
index 3586acb..be8f7e2 100644 (file)
@@ -2623,4 +2623,4 @@ module_hid_driver(wacom_driver);
 MODULE_VERSION(DRIVER_VERSION);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE(DRIVER_LICENSE);
+MODULE_LICENSE("GPL");
index 1f3bdd1..4aa3de9 100644 (file)
@@ -168,19 +168,21 @@ static int wacom_pl_irq(struct wacom_wac *wacom)
                wacom->id[0] = STYLUS_DEVICE_ID;
        }
 
-       pressure = (signed char)((data[7] << 1) | ((data[4] >> 2) & 1));
-       if (features->pressure_max > 255)
-               pressure = (pressure << 1) | ((data[4] >> 6) & 1);
-       pressure += (features->pressure_max + 1) / 2;
-
-       input_report_abs(input, ABS_X, data[3] | (data[2] << 7) | ((data[1] & 0x03) << 14));
-       input_report_abs(input, ABS_Y, data[6] | (data[5] << 7) | ((data[4] & 0x03) << 14));
-       input_report_abs(input, ABS_PRESSURE, pressure);
-
-       input_report_key(input, BTN_TOUCH, data[4] & 0x08);
-       input_report_key(input, BTN_STYLUS, data[4] & 0x10);
-       /* Only allow the stylus2 button to be reported for the pen tool. */
-       input_report_key(input, BTN_STYLUS2, (wacom->tool[0] == BTN_TOOL_PEN) && (data[4] & 0x20));
+       if (prox) {
+               pressure = (signed char)((data[7] << 1) | ((data[4] >> 2) & 1));
+               if (features->pressure_max > 255)
+                       pressure = (pressure << 1) | ((data[4] >> 6) & 1);
+               pressure += (features->pressure_max + 1) / 2;
+
+               input_report_abs(input, ABS_X, data[3] | (data[2] << 7) | ((data[1] & 0x03) << 14));
+               input_report_abs(input, ABS_Y, data[6] | (data[5] << 7) | ((data[4] & 0x03) << 14));
+               input_report_abs(input, ABS_PRESSURE, pressure);
+
+               input_report_key(input, BTN_TOUCH, data[4] & 0x08);
+               input_report_key(input, BTN_STYLUS, data[4] & 0x10);
+               /* Only allow the stylus2 button to be reported for the pen tool. */
+               input_report_key(input, BTN_STYLUS2, (wacom->tool[0] == BTN_TOOL_PEN) && (data[4] & 0x20));
+       }
 
        if (!prox)
                wacom->id[0] = 0;