HID: lenovo: Add support for ThinkPad X13 Folio keyboard

Add USB ID support for the ThinkPad X13 detachable keyboard.
The Keyboard uses the same HID raw event protocol as the ThinkPad
X12 Gen 2. The functionality stays the same with X12 Gen 2 Keyboards.

Also declare KEY_PERFORMANCE capability in lenovo_input_configured()
for X13 detachable, allowing userspace to discover the key via evdev
capability bits.

Signed-off-by: Vishnu Sankar <vishnuocv@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 426ff78c1c033d6b9ced1e5790aa6a39807ee309..8e876a3a6476d4852e372b7cd2efa6d3726004ee 100644 (file)
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -874,6 +874,7 @@
 #define USB_DEVICE_ID_LENOVO_X1_TAB3   0x60b5
 #define USB_DEVICE_ID_LENOVO_X12_TAB   0x60fe
 #define USB_DEVICE_ID_LENOVO_X12_TAB2  0x61ae
+#define USB_DEVICE_ID_LENOVO_X13_TAB   0x62af
 #define USB_DEVICE_ID_LENOVO_YOGABOOK9I        0x6161
 #define USB_DEVICE_ID_LENOVO_OPTICAL_USB_MOUSE_600E    0x600e
 #define USB_DEVICE_ID_LENOVO_PIXART_USB_MOUSE_608D     0x608d

diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c
index c11957ae8b778bee4cd0e70d2fbdb40798f1d19b..c86a54d9b2b21e716444aedcd2da9c7f5a9d0b3e 100644 (file)
--- a/drivers/hid/hid-lenovo.c
+++ b/drivers/hid/hid-lenovo.c
@@ -505,6 +505,7 @@ static int lenovo_input_mapping(struct hid_device *hdev,
                                                               usage, bit, max);
        case USB_DEVICE_ID_LENOVO_X12_TAB:
        case USB_DEVICE_ID_LENOVO_X12_TAB2:
+       case USB_DEVICE_ID_LENOVO_X13_TAB:
        case USB_DEVICE_ID_LENOVO_X1_TAB:
        case USB_DEVICE_ID_LENOVO_X1_TAB2:
        case USB_DEVICE_ID_LENOVO_X1_TAB3:
@@ -621,6 +622,7 @@ static ssize_t attr_fn_lock_store(struct device *dev,
                break;
        case USB_DEVICE_ID_LENOVO_X12_TAB:
        case USB_DEVICE_ID_LENOVO_X12_TAB2:
+       case USB_DEVICE_ID_LENOVO_X13_TAB:
        case USB_DEVICE_ID_LENOVO_TP10UBKBD:
        case USB_DEVICE_ID_LENOVO_X1_TAB:
        case USB_DEVICE_ID_LENOVO_X1_TAB2:
@@ -792,9 +794,10 @@ static int lenovo_raw_event(struct hid_device *hdev,
         * Lenovo TP X12 Tab KBD's Fn+XX is HID raw data defined. Report ID is 0x03
         * e.g.: Raw data received for MIC mute is 0x00020003.
         */
-       if (unlikely((hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB
-                       || hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB2)
-                       && size >= 4 && report->id == 0x03))
+       if (unlikely((hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB ||
+                     hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB2 ||
+                     hdev->product == USB_DEVICE_ID_LENOVO_X13_TAB) &&
+                     size >= 4 && report->id == 0x03))
                return lenovo_raw_event_TP_X12_tab(hdev, get_unaligned_le32(data));
 
        return 0;
@@ -878,6 +881,7 @@ static int lenovo_event(struct hid_device *hdev, struct hid_field *field,
                return lenovo_event_cptkbd(hdev, field, usage, value);
        case USB_DEVICE_ID_LENOVO_X12_TAB:
        case USB_DEVICE_ID_LENOVO_X12_TAB2:
+       case USB_DEVICE_ID_LENOVO_X13_TAB:
        case USB_DEVICE_ID_LENOVO_TP10UBKBD:
        case USB_DEVICE_ID_LENOVO_X1_TAB:
        case USB_DEVICE_ID_LENOVO_X1_TAB2:
@@ -1162,6 +1166,7 @@ static int lenovo_led_brightness_set(struct led_classdev *led_cdev,
                break;
        case USB_DEVICE_ID_LENOVO_X12_TAB:
        case USB_DEVICE_ID_LENOVO_X12_TAB2:
+       case USB_DEVICE_ID_LENOVO_X13_TAB:
        case USB_DEVICE_ID_LENOVO_TP10UBKBD:
        case USB_DEVICE_ID_LENOVO_X1_TAB:
        case USB_DEVICE_ID_LENOVO_X1_TAB2:
@@ -1356,7 +1361,8 @@ static int lenovo_probe_tp10ubkbd(struct hid_device *hdev)
         */
 
        data->fn_lock = !(hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB ||
-                       hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB2);
+                       hdev->product == USB_DEVICE_ID_LENOVO_X12_TAB2 ||
+                       hdev->product == USB_DEVICE_ID_LENOVO_X13_TAB);
 
        lenovo_led_set_tp10ubkbd(hdev, TP10UBKBD_FN_LOCK_LED, data->fn_lock);
 
@@ -1403,6 +1409,7 @@ static int lenovo_probe(struct hid_device *hdev,
                break;
        case USB_DEVICE_ID_LENOVO_X12_TAB:
        case USB_DEVICE_ID_LENOVO_X12_TAB2:
+       case USB_DEVICE_ID_LENOVO_X13_TAB:
        case USB_DEVICE_ID_LENOVO_TP10UBKBD:
        case USB_DEVICE_ID_LENOVO_X1_TAB:
        case USB_DEVICE_ID_LENOVO_X1_TAB2:
@@ -1491,6 +1498,7 @@ static void lenovo_remove(struct hid_device *hdev)
                break;
        case USB_DEVICE_ID_LENOVO_X12_TAB:
        case USB_DEVICE_ID_LENOVO_X12_TAB2:
+       case USB_DEVICE_ID_LENOVO_X13_TAB:
        case USB_DEVICE_ID_LENOVO_TP10UBKBD:
        case USB_DEVICE_ID_LENOVO_X1_TAB:
        case USB_DEVICE_ID_LENOVO_X1_TAB2:
@@ -1518,6 +1526,9 @@ static int lenovo_input_configured(struct hid_device *hdev,
                                                hi->input->propbit);
                        }
                        break;
+               case USB_DEVICE_ID_LENOVO_X13_TAB:
+                       input_set_capability(hi->input, EV_KEY, KEY_PERFORMANCE);
+                       break;
        }
 
        return 0;
@@ -1552,6 +1563,8 @@ static const struct hid_device_id lenovo_devices[] = {
                     USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X12_TAB) },
        { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
                     USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X12_TAB2) },
+       { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC,
+                    USB_VENDOR_ID_LENOVO, USB_DEVICE_ID_LENOVO_X13_TAB) },
        { HID_DEVICE(BUS_I2C, HID_GROUP_GENERIC,
                     USB_VENDOR_ID_ITE, I2C_DEVICE_ID_ITE_LENOVO_YOGA_SLIM_7X_KEYBOARD) },
        { }