Merge branch 'for-4.15/sony' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:09:44 +0000 (11:09 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:10:21 +0000 (11:10 +0100)
- SHANWAN PS3 rumble fix from Bastien Nocera

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
13 files changed:
drivers/hid/hid-alps.c
drivers/hid/hid-asus.c
drivers/hid/hid-core.c
drivers/hid/hid-hyperv.c
drivers/hid/hid-ids.h
drivers/hid/hid-lg.c
drivers/hid/hid-lg4ff.c
drivers/hid/hid-multitouch.c
drivers/hid/hid-rmi.c
drivers/hid/hid-tmff.c
drivers/hid/usbhid/hid-quirks.c
drivers/hid/wacom_wac.h
include/linux/hid.h

index ed9c0ea5b026efa698462bc389307bd16427f98c..b1eeb4839bfc8f4747a1610077fda3ae6c7e77a7 100644 (file)
 #define ADDRESS_U1_PAD_BTN             0x00800052
 #define ADDRESS_U1_SP_BTN              0x0080009F
 
+#define T4_INPUT_REPORT_LEN                    sizeof(struct t4_input_report)
+#define T4_FEATURE_REPORT_LEN          T4_INPUT_REPORT_LEN
+#define T4_FEATURE_REPORT_ID           7
+#define T4_CMD_REGISTER_READ                   0x08
+#define T4_CMD_REGISTER_WRITE                  0x07
+
+#define T4_ADDRESS_BASE                                0xC2C0
+#define PRM_SYS_CONFIG_1                       (T4_ADDRESS_BASE + 0x0002)
+#define T4_PRM_FEED_CONFIG_1           (T4_ADDRESS_BASE + 0x0004)
+#define T4_PRM_FEED_CONFIG_4           (T4_ADDRESS_BASE + 0x001A)
+#define T4_PRM_ID_CONFIG_3                     (T4_ADDRESS_BASE + 0x00B0)
+
+
+#define T4_FEEDCFG4_ADVANCED_ABS_ENABLE                        0x01
+#define T4_I2C_ABS     0x78
+
+#define T4_COUNT_PER_ELECTRODE         256
 #define MAX_TOUCHES    5
 
+enum dev_num {
+       U1,
+       T4,
+       UNKNOWN,
+};
 /**
  * struct u1_data
  *
  * @input2: pointer to the kernel input2 device
  * @hdev: pointer to the struct hid_device
  *
- * @dev_ctrl: device control parameter
  * @dev_type: device type
- * @sen_line_num_x: number of sensor line of X
- * @sen_line_num_y: number of sensor line of Y
- * @pitch_x: sensor pitch of X
- * @pitch_y: sensor pitch of Y
- * @resolution: resolution
- * @btn_info: button information
+ * @max_fingers: total number of fingers
+ * @has_sp: boolean of sp existense
+ * @sp_btn_info: button information
  * @x_active_len_mm: active area length of X (mm)
  * @y_active_len_mm: active area length of Y (mm)
  * @x_max: maximum x coordinate value
  * @y_max: maximum y coordinate value
+ * @x_min: minimum x coordinate value
+ * @y_min: minimum y coordinate value
  * @btn_cnt: number of buttons
  * @sp_btn_cnt: number of stick buttons
  */
-struct u1_dev {
+struct alps_dev {
        struct input_dev *input;
        struct input_dev *input2;
        struct hid_device *hdev;
 
-       u8      dev_ctrl;
-       u8      dev_type;
-       u8      sen_line_num_x;
-       u8      sen_line_num_y;
-       u8      pitch_x;
-       u8      pitch_y;
-       u8      resolution;
-       u8      btn_info;
+       enum dev_num dev_type;
+       u8  max_fingers;
+       u8  has_sp;
        u8      sp_btn_info;
        u32     x_active_len_mm;
        u32     y_active_len_mm;
        u32     x_max;
        u32     y_max;
+       u32     x_min;
+       u32     y_min;
        u32     btn_cnt;
        u32     sp_btn_cnt;
 };
 
+struct t4_contact_data {
+       u8  palm;
+       u8      x_lo;
+       u8      x_hi;
+       u8      y_lo;
+       u8      y_hi;
+};
+
+struct t4_input_report {
+       u8  reportID;
+       u8  numContacts;
+       struct t4_contact_data contact[5];
+       u8  button;
+       u8  track[5];
+       u8  zx[5], zy[5];
+       u8  palmTime[5];
+       u8  kilroy;
+       u16 timeStamp;
+};
+
+static u16 t4_calc_check_sum(u8 *buffer,
+               unsigned long offset, unsigned long length)
+{
+       u16 sum1 = 0xFF, sum2 = 0xFF;
+       unsigned long i = 0;
+
+       if (offset + length >= 50)
+               return 0;
+
+       while (length > 0) {
+               u32 tlen = length > 20 ? 20 : length;
+
+               length -= tlen;
+
+               do {
+                       sum1 += buffer[offset + i];
+                       sum2 += sum1;
+                       i++;
+               } while (--tlen > 0);
+
+               sum1 = (sum1 & 0xFF) + (sum1 >> 8);
+               sum2 = (sum2 & 0xFF) + (sum2 >> 8);
+       }
+
+       sum1 = (sum1 & 0xFF) + (sum1 >> 8);
+       sum2 = (sum2 & 0xFF) + (sum2 >> 8);
+
+       return(sum2 << 8 | sum1);
+}
+
+static int t4_read_write_register(struct hid_device *hdev, u32 address,
+       u8 *read_val, u8 write_val, bool read_flag)
+{
+       int ret;
+       u16 check_sum;
+       u8 *input;
+       u8 *readbuf;
+
+       input = kzalloc(T4_FEATURE_REPORT_LEN, GFP_KERNEL);
+       if (!input)
+               return -ENOMEM;
+
+       input[0] = T4_FEATURE_REPORT_ID;
+       if (read_flag) {
+               input[1] = T4_CMD_REGISTER_READ;
+               input[8] = 0x00;
+       } else {
+               input[1] = T4_CMD_REGISTER_WRITE;
+               input[8] = write_val;
+       }
+       put_unaligned_le32(address, input + 2);
+       input[6] = 1;
+       input[7] = 0;
+
+       /* Calculate the checksum */
+       check_sum = t4_calc_check_sum(input, 1, 8);
+       input[9] = (u8)check_sum;
+       input[10] = (u8)(check_sum >> 8);
+       input[11] = 0;
+
+       ret = hid_hw_raw_request(hdev, T4_FEATURE_REPORT_ID, input,
+                       T4_FEATURE_REPORT_LEN,
+                       HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
+
+       if (ret < 0) {
+               dev_err(&hdev->dev, "failed to read command (%d)\n", ret);
+               goto exit;
+       }
+
+       readbuf = kzalloc(T4_FEATURE_REPORT_LEN, GFP_KERNEL);
+       if (read_flag) {
+               if (!readbuf) {
+                       ret = -ENOMEM;
+                       goto exit;
+               }
+
+               ret = hid_hw_raw_request(hdev, T4_FEATURE_REPORT_ID, readbuf,
+                               T4_FEATURE_REPORT_LEN,
+                               HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
+               if (ret < 0) {
+                       dev_err(&hdev->dev, "failed read register (%d)\n", ret);
+                       goto exit_readbuf;
+               }
+
+               if (*(u32 *)&readbuf[6] != address) {
+                       dev_err(&hdev->dev, "read register address error (%x,%x)\n",
+                       *(u32 *)&readbuf[6], address);
+                       goto exit_readbuf;
+               }
+
+               if (*(u16 *)&readbuf[10] != 1) {
+                       dev_err(&hdev->dev, "read register size error (%x)\n",
+                       *(u16 *)&readbuf[10]);
+                       goto exit_readbuf;
+               }
+
+               check_sum = t4_calc_check_sum(readbuf, 6, 7);
+               if (*(u16 *)&readbuf[13] != check_sum) {
+                       dev_err(&hdev->dev, "read register checksum error (%x,%x)\n",
+                       *(u16 *)&readbuf[13], check_sum);
+                       goto exit_readbuf;
+               }
+
+               *read_val = readbuf[12];
+       }
+
+       ret = 0;
+
+exit_readbuf:
+       kfree(readbuf);
+exit:
+       kfree(input);
+       return ret;
+}
+
 static int u1_read_write_register(struct hid_device *hdev, u32 address,
        u8 *read_val, u8 write_val, bool read_flag)
 {
@@ -165,21 +317,60 @@ exit:
        return ret;
 }
 
-static int alps_raw_event(struct hid_device *hdev,
-               struct hid_report *report, u8 *data, int size)
+static int t4_raw_event(struct alps_dev *hdata, u8 *data, int size)
+{
+       unsigned int x, y, z;
+       int i;
+       struct t4_input_report *p_report = (struct t4_input_report *)data;
+
+       if (!data)
+               return 0;
+       for (i = 0; i < hdata->max_fingers; i++) {
+               x = p_report->contact[i].x_hi << 8 | p_report->contact[i].x_lo;
+               y = p_report->contact[i].y_hi << 8 | p_report->contact[i].y_lo;
+               y = hdata->y_max - y + hdata->y_min;
+               z = (p_report->contact[i].palm < 0x80 &&
+                       p_report->contact[i].palm > 0) * 62;
+               if (x == 0xffff) {
+                       x = 0;
+                       y = 0;
+                       z = 0;
+               }
+               input_mt_slot(hdata->input, i);
+
+               input_mt_report_slot_state(hdata->input,
+                       MT_TOOL_FINGER, z != 0);
+
+               if (!z)
+                       continue;
+
+               input_report_abs(hdata->input, ABS_MT_POSITION_X, x);
+               input_report_abs(hdata->input, ABS_MT_POSITION_Y, y);
+               input_report_abs(hdata->input, ABS_MT_PRESSURE, z);
+       }
+       input_mt_sync_frame(hdata->input);
+
+       input_report_key(hdata->input, BTN_LEFT, p_report->button);
+
+       input_sync(hdata->input);
+       return 1;
+}
+
+static int u1_raw_event(struct alps_dev *hdata, u8 *data, int size)
 {
        unsigned int x, y, z;
        int i;
        short sp_x, sp_y;
-       struct u1_dev *hdata = hid_get_drvdata(hdev);
 
+       if (!data)
+               return 0;
        switch (data[0]) {
        case U1_MOUSE_REPORT_ID:
                break;
        case U1_FEATURE_REPORT_ID:
                break;
        case U1_ABSOLUTE_REPORT_ID:
-               for (i = 0; i < MAX_TOUCHES; i++) {
+               for (i = 0; i < hdata->max_fingers; i++) {
                        u8 *contact = &data[i * 5];
 
                        x = get_unaligned_le16(contact + 3);
@@ -241,122 +432,253 @@ static int alps_raw_event(struct hid_device *hdev,
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int alps_post_reset(struct hid_device *hdev)
+static int alps_raw_event(struct hid_device *hdev,
+               struct hid_report *report, u8 *data, int size)
 {
-       return u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,
-                               NULL, U1_TP_ABS_MODE | U1_SP_ABS_MODE, false);
+       int ret = 0;
+       struct alps_dev *hdata = hid_get_drvdata(hdev);
+
+       switch (hdev->product) {
+       case HID_PRODUCT_ID_T4_BTNLESS:
+               ret = t4_raw_event(hdata, data, size);
+               break;
+       default:
+               ret = u1_raw_event(hdata, data, size);
+               break;
+       }
+       return ret;
 }
 
-static int alps_post_resume(struct hid_device *hdev)
+static int __maybe_unused alps_post_reset(struct hid_device *hdev)
 {
-       return u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,
-                               NULL, U1_TP_ABS_MODE | U1_SP_ABS_MODE, false);
+       int ret = -1;
+       struct alps_dev *data = hid_get_drvdata(hdev);
+
+       switch (data->dev_type) {
+       case T4:
+               ret = t4_read_write_register(hdev, T4_PRM_FEED_CONFIG_1,
+                       NULL, T4_I2C_ABS, false);
+               ret = t4_read_write_register(hdev, T4_PRM_FEED_CONFIG_4,
+                       NULL, T4_FEEDCFG4_ADVANCED_ABS_ENABLE, false);
+               break;
+       case U1:
+               ret = u1_read_write_register(hdev,
+                       ADDRESS_U1_DEV_CTRL_1, NULL,
+                       U1_TP_ABS_MODE | U1_SP_ABS_MODE, false);
+               break;
+       default:
+               break;
+       }
+       return ret;
 }
-#endif /* CONFIG_PM */
 
-static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
+static int __maybe_unused alps_post_resume(struct hid_device *hdev)
 {
-       struct u1_dev *data = hid_get_drvdata(hdev);
-       struct input_dev *input = hi->input, *input2;
-       struct u1_dev devInfo;
-       int ret;
-       int res_x, res_y, i;
-
-       data->input = input;
-
-       hid_dbg(hdev, "Opening low level driver\n");
-       ret = hid_hw_open(hdev);
-       if (ret)
-               return ret;
+       return alps_post_reset(hdev);
+}
 
-       /* Allow incoming hid reports */
-       hid_device_io_start(hdev);
+static int u1_init(struct hid_device *hdev, struct alps_dev *pri_data)
+{
+       int ret;
+       u8 tmp, dev_ctrl, sen_line_num_x, sen_line_num_y;
+       u8 pitch_x, pitch_y, resolution;
 
        /* Device initialization */
        ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,
-                       &devInfo.dev_ctrl, 0, true);
+                       &dev_ctrl, 0, true);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_DEV_CTRL_1 (%d)\n", ret);
                goto exit;
        }
 
-       devInfo.dev_ctrl &= ~U1_DISABLE_DEV;
-       devInfo.dev_ctrl |= U1_TP_ABS_MODE;
+       dev_ctrl &= ~U1_DISABLE_DEV;
+       dev_ctrl |= U1_TP_ABS_MODE;
        ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,
-                       NULL, devInfo.dev_ctrl, false);
+                       NULL, dev_ctrl, false);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed to change TP mode (%d)\n", ret);
                goto exit;
        }
 
        ret = u1_read_write_register(hdev, ADDRESS_U1_NUM_SENS_X,
-                       &devInfo.sen_line_num_x, 0, true);
+                       &sen_line_num_x, 0, true);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_NUM_SENS_X (%d)\n", ret);
                goto exit;
        }
 
        ret = u1_read_write_register(hdev, ADDRESS_U1_NUM_SENS_Y,
-                       &devInfo.sen_line_num_y, 0, true);
+                       &sen_line_num_y, 0, true);
                if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_NUM_SENS_Y (%d)\n", ret);
                goto exit;
        }
 
        ret = u1_read_write_register(hdev, ADDRESS_U1_PITCH_SENS_X,
-                       &devInfo.pitch_x, 0, true);
+                       &pitch_x, 0, true);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_PITCH_SENS_X (%d)\n", ret);
                goto exit;
        }
 
        ret = u1_read_write_register(hdev, ADDRESS_U1_PITCH_SENS_Y,
-                       &devInfo.pitch_y, 0, true);
+                       &pitch_y, 0, true);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_PITCH_SENS_Y (%d)\n", ret);
                goto exit;
        }
 
        ret = u1_read_write_register(hdev, ADDRESS_U1_RESO_DWN_ABS,
-               &devInfo.resolution, 0, true);
+               &resolution, 0, true);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_RESO_DWN_ABS (%d)\n", ret);
                goto exit;
        }
+       pri_data->x_active_len_mm =
+               (pitch_x * (sen_line_num_x - 1)) / 10;
+       pri_data->y_active_len_mm =
+               (pitch_y * (sen_line_num_y - 1)) / 10;
+
+       pri_data->x_max =
+               (resolution << 2) * (sen_line_num_x - 1);
+       pri_data->x_min = 1;
+       pri_data->y_max =
+               (resolution << 2) * (sen_line_num_y - 1);
+       pri_data->y_min = 1;
 
        ret = u1_read_write_register(hdev, ADDRESS_U1_PAD_BTN,
-                       &devInfo.btn_info, 0, true);
+                       &tmp, 0, true);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_PAD_BTN (%d)\n", ret);
                goto exit;
        }
+       if ((tmp & 0x0F) == (tmp & 0xF0) >> 4) {
+               pri_data->btn_cnt = (tmp & 0x0F);
+       } else {
+               /* Button pad */
+               pri_data->btn_cnt = 1;
+       }
 
+       pri_data->has_sp = 0;
        /* Check StickPointer device */
        ret = u1_read_write_register(hdev, ADDRESS_U1_DEVICE_TYP,
-                       &devInfo.dev_type, 0, true);
+                       &tmp, 0, true);
        if (ret < 0) {
                dev_err(&hdev->dev, "failed U1_DEVICE_TYP (%d)\n", ret);
                goto exit;
        }
+       if (tmp & U1_DEVTYPE_SP_SUPPORT) {
+               dev_ctrl |= U1_SP_ABS_MODE;
+               ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,
+                       NULL, dev_ctrl, false);
+               if (ret < 0) {
+                       dev_err(&hdev->dev, "failed SP mode (%d)\n", ret);
+                       goto exit;
+               }
 
-       devInfo.x_active_len_mm =
-               (devInfo.pitch_x * (devInfo.sen_line_num_x - 1)) / 10;
-       devInfo.y_active_len_mm =
-               (devInfo.pitch_y * (devInfo.sen_line_num_y - 1)) / 10;
+               ret = u1_read_write_register(hdev, ADDRESS_U1_SP_BTN,
+                       &pri_data->sp_btn_info, 0, true);
+               if (ret < 0) {
+                       dev_err(&hdev->dev, "failed U1_SP_BTN (%d)\n", ret);
+                       goto exit;
+               }
+               pri_data->has_sp = 1;
+       }
+       pri_data->max_fingers = 5;
+exit:
+       return ret;
+}
 
-       devInfo.x_max =
-               (devInfo.resolution << 2) * (devInfo.sen_line_num_x - 1);
-       devInfo.y_max =
-               (devInfo.resolution << 2) * (devInfo.sen_line_num_y - 1);
+static int T4_init(struct hid_device *hdev, struct alps_dev *pri_data)
+{
+       int ret;
+       u8 tmp, sen_line_num_x, sen_line_num_y;
+
+       ret = t4_read_write_register(hdev, T4_PRM_ID_CONFIG_3, &tmp, 0, true);
+       if (ret < 0) {
+               dev_err(&hdev->dev, "failed T4_PRM_ID_CONFIG_3 (%d)\n", ret);
+               goto exit;
+       }
+       sen_line_num_x = 16 + ((tmp & 0x0F)  | (tmp & 0x08 ? 0xF0 : 0));
+       sen_line_num_y = 12 + (((tmp & 0xF0) >> 4)  | (tmp & 0x80 ? 0xF0 : 0));
+
+       pri_data->x_max = sen_line_num_x * T4_COUNT_PER_ELECTRODE;
+       pri_data->x_min = T4_COUNT_PER_ELECTRODE;
+       pri_data->y_max = sen_line_num_y * T4_COUNT_PER_ELECTRODE;
+       pri_data->y_min = T4_COUNT_PER_ELECTRODE;
+       pri_data->x_active_len_mm = pri_data->y_active_len_mm = 0;
+       pri_data->btn_cnt = 1;
+
+       ret = t4_read_write_register(hdev, PRM_SYS_CONFIG_1, &tmp, 0, true);
+       if (ret < 0) {
+               dev_err(&hdev->dev, "failed PRM_SYS_CONFIG_1 (%d)\n", ret);
+               goto exit;
+       }
+       tmp |= 0x02;
+       ret = t4_read_write_register(hdev, PRM_SYS_CONFIG_1, NULL, tmp, false);
+       if (ret < 0) {
+               dev_err(&hdev->dev, "failed PRM_SYS_CONFIG_1 (%d)\n", ret);
+               goto exit;
+       }
+
+       ret = t4_read_write_register(hdev, T4_PRM_FEED_CONFIG_1,
+                                       NULL, T4_I2C_ABS, false);
+       if (ret < 0) {
+               dev_err(&hdev->dev, "failed T4_PRM_FEED_CONFIG_1 (%d)\n", ret);
+               goto exit;
+       }
+
+       ret = t4_read_write_register(hdev, T4_PRM_FEED_CONFIG_4, NULL,
+                               T4_FEEDCFG4_ADVANCED_ABS_ENABLE, false);
+       if (ret < 0) {
+               dev_err(&hdev->dev, "failed T4_PRM_FEED_CONFIG_4 (%d)\n", ret);
+               goto exit;
+       }
+       pri_data->max_fingers = 5;
+       pri_data->has_sp = 0;
+exit:
+       return ret;
+}
+
+static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
+{
+       struct alps_dev *data = hid_get_drvdata(hdev);
+       struct input_dev *input = hi->input, *input2;
+       int ret;
+       int res_x, res_y, i;
+
+       data->input = input;
+
+       hid_dbg(hdev, "Opening low level driver\n");
+       ret = hid_hw_open(hdev);
+       if (ret)
+               return ret;
+
+       /* Allow incoming hid reports */
+       hid_device_io_start(hdev);
+       switch (data->dev_type) {
+       case T4:
+               ret = T4_init(hdev, data);
+               break;
+       case U1:
+               ret = u1_init(hdev, data);
+               break;
+       default:
+               break;
+       }
+
+       if (ret)
+               goto exit;
 
        __set_bit(EV_ABS, input->evbit);
-       input_set_abs_params(input, ABS_MT_POSITION_X, 1, devInfo.x_max, 0, 0);
-       input_set_abs_params(input, ABS_MT_POSITION_Y, 1, devInfo.y_max, 0, 0);
+       input_set_abs_params(input, ABS_MT_POSITION_X,
+                                               data->x_min, data->x_max, 0, 0);
+       input_set_abs_params(input, ABS_MT_POSITION_Y,
+                                               data->y_min, data->y_max, 0, 0);
 
-       if (devInfo.x_active_len_mm && devInfo.y_active_len_mm) {
-               res_x = (devInfo.x_max - 1) / devInfo.x_active_len_mm;
-               res_y = (devInfo.y_max - 1) / devInfo.y_active_len_mm;
+       if (data->x_active_len_mm && data->y_active_len_mm) {
+               res_x = (data->x_max - 1) / data->x_active_len_mm;
+               res_y = (data->y_max - 1) / data->y_active_len_mm;
 
                input_abs_set_res(input, ABS_MT_POSITION_X, res_x);
                input_abs_set_res(input, ABS_MT_POSITION_Y, res_y);
@@ -364,49 +686,25 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
 
        input_set_abs_params(input, ABS_MT_PRESSURE, 0, 64, 0, 0);
 
-       input_mt_init_slots(input, MAX_TOUCHES, INPUT_MT_POINTER);
+       input_mt_init_slots(input, data->max_fingers, INPUT_MT_POINTER);
 
        __set_bit(EV_KEY, input->evbit);
-       if ((devInfo.btn_info & 0x0F) == (devInfo.btn_info & 0xF0) >> 4) {
-               devInfo.btn_cnt = (devInfo.btn_info & 0x0F);
-       } else {
-               /* Button pad */
-               devInfo.btn_cnt = 1;
+
+       if (data->btn_cnt == 1)
                __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
-       }
 
-       for (i = 0; i < devInfo.btn_cnt; i++)
+       for (i = 0; i < data->btn_cnt; i++)
                __set_bit(BTN_LEFT + i, input->keybit);
 
-
        /* Stick device initialization */
-       if (devInfo.dev_type & U1_DEVTYPE_SP_SUPPORT) {
-
+       if (data->has_sp) {
                input2 = input_allocate_device();
                if (!input2) {
-                       ret = -ENOMEM;
-                       goto exit;
-               }
-
-               data->input2 = input2;
-
-               devInfo.dev_ctrl |= U1_SP_ABS_MODE;
-               ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,
-                       NULL, devInfo.dev_ctrl, false);
-               if (ret < 0) {
-                       dev_err(&hdev->dev, "failed SP mode (%d)\n", ret);
-                       input_free_device(input2);
-                       goto exit;
-               }
-
-               ret = u1_read_write_register(hdev, ADDRESS_U1_SP_BTN,
-                       &devInfo.sp_btn_info, 0, true);
-               if (ret < 0) {
-                       dev_err(&hdev->dev, "failed U1_SP_BTN (%d)\n", ret);
                        input_free_device(input2);
                        goto exit;
                }
 
+               data->input2 = input2;
                input2->phys = input->phys;
                input2->name = "DualPoint Stick";
                input2->id.bustype = BUS_I2C;
@@ -416,8 +714,8 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
                input2->dev.parent = input->dev.parent;
 
                __set_bit(EV_KEY, input2->evbit);
-               devInfo.sp_btn_cnt = (devInfo.sp_btn_info & 0x0F);
-               for (i = 0; i < devInfo.sp_btn_cnt; i++)
+               data->sp_btn_cnt = (data->sp_btn_info & 0x0F);
+               for (i = 0; i < data->sp_btn_cnt; i++)
                        __set_bit(BTN_LEFT + i, input2->keybit);
 
                __set_bit(EV_REL, input2->evbit);
@@ -426,8 +724,7 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
                __set_bit(INPUT_PROP_POINTER, input2->propbit);
                __set_bit(INPUT_PROP_POINTING_STICK, input2->propbit);
 
-               ret = input_register_device(data->input2);
-               if (ret) {
+               if (input_register_device(data->input2)) {
                        input_free_device(input2);
                        goto exit;
                }
@@ -448,10 +745,9 @@ static int alps_input_mapping(struct hid_device *hdev,
 
 static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id)
 {
-       struct u1_dev *data = NULL;
+       struct alps_dev *data = NULL;
        int ret;
-
-       data = devm_kzalloc(&hdev->dev, sizeof(struct u1_dev), GFP_KERNEL);
+       data = devm_kzalloc(&hdev->dev, sizeof(struct alps_dev), GFP_KERNEL);
        if (!data)
                return -ENOMEM;
 
@@ -466,6 +762,18 @@ static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id)
                return ret;
        }
 
+       switch (hdev->product) {
+       case HID_DEVICE_ID_ALPS_T4_BTNLESS:
+               data->dev_type = T4;
+               break;
+       case HID_DEVICE_ID_ALPS_U1_DUAL:
+       case HID_DEVICE_ID_ALPS_U1:
+               data->dev_type = U1;
+               break;
+       default:
+               data->dev_type = UNKNOWN;
+       }
+
        ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
        if (ret) {
                hid_err(hdev, "hw start failed\n");
@@ -483,6 +791,10 @@ static void alps_remove(struct hid_device *hdev)
 static const struct hid_device_id alps_id[] = {
        { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
                USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) },
+       { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
+               USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1) },
+       { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
+               USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_T4_BTNLESS) },
        { }
 };
 MODULE_DEVICE_TABLE(hid, alps_id);
index 50c294be8324ab803450c00165717962e1603d13..1bb7b63b31508cf95c23e661370e32965c978c3a 100644 (file)
@@ -67,6 +67,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad");
 #define QUIRK_USE_KBD_BACKLIGHT                BIT(5)
 #define QUIRK_T100_KEYBOARD            BIT(6)
 #define QUIRK_T100CHI                  BIT(7)
+#define QUIRK_G752_KEYBOARD            BIT(8)
 
 #define I2C_KEYBOARD_QUIRKS                    (QUIRK_FIX_NOTEBOOK_REPORT | \
                                                 QUIRK_NO_INIT_REPORTS | \
@@ -670,6 +671,11 @@ static void asus_remove(struct hid_device *hdev)
        hid_hw_stop(hdev);
 }
 
+static const __u8 asus_g752_fixed_rdesc[] = {
+        0x19, 0x00,                    /*   Usage Minimum (0x00)       */
+        0x2A, 0xFF, 0x00,              /*   Usage Maximum (0xFF)       */
+};
+
 static __u8 *asus_report_fixup(struct hid_device *hdev, __u8 *rdesc,
                unsigned int *rsize)
 {
@@ -708,6 +714,27 @@ static __u8 *asus_report_fixup(struct hid_device *hdev, __u8 *rdesc,
                rdesc[391] = 0xff;
                rdesc[402] = 0x00;
        }
+       if (drvdata->quirks & QUIRK_G752_KEYBOARD &&
+                *rsize == 75 && rdesc[61] == 0x15 && rdesc[62] == 0x00) {
+               /* report is missing usage mninum and maximum */
+               __u8 *new_rdesc;
+               size_t new_size = *rsize + sizeof(asus_g752_fixed_rdesc);
+
+               new_rdesc = devm_kzalloc(&hdev->dev, new_size, GFP_KERNEL);
+               if (new_rdesc == NULL)
+                       return rdesc;
+
+               hid_info(hdev, "Fixing up Asus G752 keyb report descriptor\n");
+               /* copy the valid part */
+               memcpy(new_rdesc, rdesc, 61);
+               /* insert missing part */
+               memcpy(new_rdesc + 61, asus_g752_fixed_rdesc, sizeof(asus_g752_fixed_rdesc));
+               /* copy remaining data */
+               memcpy(new_rdesc + 61 + sizeof(asus_g752_fixed_rdesc), rdesc + 61, *rsize - 61);
+
+               *rsize = new_size;
+               rdesc = new_rdesc;
+       }
 
        return rdesc;
 }
@@ -718,9 +745,11 @@ static const struct hid_device_id asus_devices[] = {
        { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK,
                USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD), I2C_TOUCHPAD_QUIRKS },
        { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
-               USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1) },
+               USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1), QUIRK_USE_KBD_BACKLIGHT },
        { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
                USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2), QUIRK_USE_KBD_BACKLIGHT },
+       { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
+               USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3), QUIRK_G752_KEYBOARD },
        { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,
                USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD),
          QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },
index 330ca983828ba6d11feaf5538841a6810d84f5c6..d3f983a4245a7c8c69549451213a6ebdefb92cab 100644 (file)
@@ -1889,6 +1889,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
 #endif
 #if IS_ENABLED(CONFIG_HID_ALPS)
        { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) },
+       { HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) },
+       { HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1) },
+       { HID_I2C_DEVICE(USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_T4_BTNLESS) },
 #endif
 #if IS_ENABLED(CONFIG_HID_APPLE)
        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
@@ -1979,6 +1982,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3) },
        { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) },
        { HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },
@@ -2329,6 +2333,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb324) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb605) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
@@ -3121,4 +3126,3 @@ MODULE_AUTHOR("Andreas Gal");
 MODULE_AUTHOR("Vojtech Pavlik");
 MODULE_AUTHOR("Jiri Kosina");
 MODULE_LICENSE("GPL");
-
index 6039f071fab1370da4a684e801883ef23e9706d4..3aa2bb9f0f811dbe118de6f31ce25900c33f7fd1 100644 (file)
@@ -313,7 +313,7 @@ static void mousevsc_on_receive(struct hv_device *device,
 
                break;
        default:
-               pr_err("unsupported hid msg type - type %d len %d",
+               pr_err("unsupported hid msg type - type %d len %d\n",
                       hid_msg->header.type, hid_msg->header.size);
                break;
        }
index be2e005c3c516c6cb522a68a891d75e48f8f800f..c9f7c74b3b60ed5acaef11b64b20220fac10b0f0 100644 (file)
@@ -77,6 +77,9 @@
 #define HID_DEVICE_ID_ALPS_U1_DUAL     0x120B
 #define HID_DEVICE_ID_ALPS_U1_DUAL_PTP 0x121F
 #define HID_DEVICE_ID_ALPS_U1_DUAL_3BTN_PTP    0x1220
+#define HID_DEVICE_ID_ALPS_U1          0x1215
+#define HID_DEVICE_ID_ALPS_T4_BTNLESS  0x120C
+
 
 #define USB_VENDOR_ID_AMI              0x046b
 #define USB_DEVICE_ID_AMI_VIRT_KEYBOARD_AND_MOUSE      0xff10
 #define USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD     0x0101
 #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1 0x1854
 #define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2 0x1837
+#define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822
 
 #define USB_VENDOR_ID_ATEN             0x0557
 #define USB_DEVICE_ID_ATEN_UC100KM     0x2004
 #define USB_DEVICE_ID_MCC_PMD1024LS    0x0076
 #define USB_DEVICE_ID_MCC_PMD1208LS    0x007a
 
+#define USB_VENDOR_ID_MCS              0x16d0
+#define USB_DEVICE_ID_MCS_GAMEPADBLOCK 0x0bcc
+
 #define USB_VENDOR_ID_MGE              0x0463
 #define USB_DEVICE_ID_MGE_UPS          0xffff
 #define USB_DEVICE_ID_MGE_UPS1         0x0001
index 52026dc94d5c4b0306ce585be293cbe2cb1910d9..596227ddb6e078af028b2d83102d40e5006b147a 100644 (file)
@@ -756,7 +756,9 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id)
 
        /* Setup wireless link with Logitech Wii wheel */
        if (hdev->product == USB_DEVICE_ID_LOGITECH_WII_WHEEL) {
-               const unsigned char cbuf[] = { 0x00, 0xAF,  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+               static const unsigned char cbuf[] = {
+                       0x00, 0xAF,  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+               };
                u8 *buf = kmemdup(cbuf, sizeof(cbuf), GFP_KERNEL);
 
                if (!buf) {
index 1fc12e3570359248f2cd2847aad219ad4f134a81..512d67e1aae386e37b90288f800734b5a826aebe 100644 (file)
@@ -474,9 +474,7 @@ static int lg4ff_play(struct input_dev *dev, void *data, struct ff_effect *effec
 static void lg4ff_set_autocenter_default(struct input_dev *dev, u16 magnitude)
 {
        struct hid_device *hid = input_get_drvdata(dev);
-       struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list;
-       struct hid_report *report = list_entry(report_list->next, struct hid_report, list);
-       s32 *value = report->field[0]->value;
+       s32 *value;
        u32 expand_a, expand_b;
        struct lg4ff_device_entry *entry;
        struct lg_drv_data *drv_data;
index 9e8c4d2ba11d2cc7c2559f34dc46fe646640e131..86fd7f4b1b26552774794a3be39958b123e9eaba 100644 (file)
@@ -43,6 +43,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/input/mt.h>
+#include <linux/jiffies.h>
 #include <linux/string.h>
 #include <linux/timer.h>
 
@@ -136,6 +137,9 @@ struct mt_device {
        bool serial_maybe;      /* need to check for serial protocol */
        bool curvalid;          /* is the current contact valid? */
        unsigned mt_flags;      /* flags to pass to input-mt */
+       __s32 dev_time;         /* the scan time provided by the device */
+       unsigned long jiffies;  /* the frame's jiffies */
+       int timestamp;          /* the timestamp to be sent */
 };
 
 static void mt_post_parse_default_settings(struct mt_device *td);
@@ -177,6 +181,12 @@ static void mt_post_parse(struct mt_device *td);
 #define MT_DEFAULT_MAXCONTACT  10
 #define MT_MAX_MAXCONTACT      250
 
+/*
+ * Resync device and local timestamps after that many microseconds without
+ * receiving data.
+ */
+#define MAX_TIMESTAMP_INTERVAL 1000000
+
 #define MT_USB_DEVICE(v, p)    HID_DEVICE(BUS_USB, HID_GROUP_MULTITOUCH, v, p)
 #define MT_BT_DEVICE(v, p)     HID_DEVICE(BUS_BLUETOOTH, HID_GROUP_MULTITOUCH, v, p)
 
@@ -583,6 +593,12 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
                                cls->sn_pressure);
                        mt_store_field(usage, td, hi);
                        return 1;
+               case HID_DG_SCANTIME:
+                       hid_map_usage(hi, usage, bit, max,
+                               EV_MSC, MSC_TIMESTAMP);
+                       input_set_capability(hi->input, EV_MSC, MSC_TIMESTAMP);
+                       mt_store_field(usage, td, hi);
+                       return 1;
                case HID_DG_CONTACTCOUNT:
                        /* Ignore if indexes are out of bounds. */
                        if (field->index >= field->report->maxfield ||
@@ -718,6 +734,7 @@ static void mt_complete_slot(struct mt_device *td, struct input_dev *input)
 static void mt_sync_frame(struct mt_device *td, struct input_dev *input)
 {
        input_mt_sync_frame(input);
+       input_event(input, EV_MSC, MSC_TIMESTAMP, td->timestamp);
        input_sync(input);
        td->num_received = 0;
        if (test_bit(MT_IO_FLAGS_ACTIVE_SLOTS, &td->mt_io_flags))
@@ -727,6 +744,28 @@ static void mt_sync_frame(struct mt_device *td, struct input_dev *input)
        clear_bit(MT_IO_FLAGS_ACTIVE_SLOTS, &td->mt_io_flags);
 }
 
+static int mt_compute_timestamp(struct mt_device *td, struct hid_field *field,
+               __s32 value)
+{
+       long delta = value - td->dev_time;
+       unsigned long jdelta = jiffies_to_usecs(jiffies - td->jiffies);
+
+       td->jiffies = jiffies;
+       td->dev_time = value;
+
+       if (delta < 0)
+               delta += field->logical_maximum;
+
+       /* HID_DG_SCANTIME is expressed in 100us, we want it in us. */
+       delta *= 100;
+
+       if (jdelta > MAX_TIMESTAMP_INTERVAL)
+               /* No data received for a while, resync the timestamp. */
+               return 0;
+       else
+               return td->timestamp + delta;
+}
+
 static int mt_touch_event(struct hid_device *hid, struct hid_field *field,
                                struct hid_usage *usage, __s32 value)
 {
@@ -787,6 +826,9 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field,
                case HID_DG_HEIGHT:
                        td->curdata.h = value;
                        break;
+               case HID_DG_SCANTIME:
+                       td->timestamp = mt_compute_timestamp(td, field, value);
+                       break;
                case HID_DG_CONTACTCOUNT:
                        break;
                case HID_DG_TOUCH:
index ef241d66562e00950e8979ef4fd0633fd4efdca3..0f43c4292685fcd4bcde4eeeb6268d17a31fe89e 100644 (file)
@@ -368,6 +368,11 @@ static int rmi_check_sanity(struct hid_device *hdev, u8 *data, int size)
 static int rmi_raw_event(struct hid_device *hdev,
                struct hid_report *report, u8 *data, int size)
 {
+       struct rmi_data *hdata = hid_get_drvdata(hdev);
+
+       if (!(hdata->device_flags & RMI_DEVICE))
+               return 0;
+
        size = rmi_check_sanity(hdev, data, size);
        if (size < 2)
                return 0;
@@ -713,9 +718,11 @@ 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);
+       if (hdata->device_flags & RMI_DEVICE) {
+               clear_bit(RMI_STARTED, &hdata->flags);
+               cancel_work_sync(&hdata->reset_work);
+               rmi_unregister_transport_device(&hdata->xport);
+       }
 
        hid_hw_stop(hdev);
 }
index b83376077d72282ac3373fe700e8d273d303fc1f..bea8def64f437ed13ed5576a479634cee0a27ca4 100644 (file)
@@ -242,6 +242,8 @@ static const struct hid_device_id tm_devices[] = {
                .driver_data = (unsigned long)ff_rumble },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb324),   /* Dual Trigger 3-in-1 (PS3 Mode) */
                .driver_data = (unsigned long)ff_rumble },
+       { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb605),   /* NASCAR PRO FF2 Wheel */
+               .driver_data = (unsigned long)ff_joystick },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651),   /* FGT Rumble Force Wheel */
                .driver_data = (unsigned long)ff_rumble },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653),   /* RGT Force Feedback CLUTCH Raging Wheel */
index f489a5cfcb48cf5216a532091482ac669786e61d..331f7f34ec14e68c85f3cd4a0b051b4e4ffdb365 100644 (file)
@@ -170,6 +170,7 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_DRACAL_RAPHNET, USB_DEVICE_ID_RAPHNET_2NES2SNES, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_DRACAL_RAPHNET, USB_DEVICE_ID_RAPHNET_4NES4SNES, HID_QUIRK_MULTI_INPUT },
        { USB_VENDOR_ID_INNOMEDIA, USB_DEVICE_ID_INNEX_GENESIS_ATARI, HID_QUIRK_MULTI_INPUT },
+       { USB_VENDOR_ID_MCS, USB_DEVICE_ID_MCS_GAMEPADBLOCK, HID_QUIRK_MULTI_INPUT },
 
        { 0, 0 }
 };
index 8a03654048bf611a008e61b4101f35262fb9a5d2..feb62fd4dfc3ecff1ba43ee46fc7f70ec9b3c6d2 100644 (file)
                                 ((f)->physical == HID_DG_PEN) || \
                                 ((f)->application == HID_DG_PEN) || \
                                 ((f)->application == HID_DG_DIGITIZER) || \
+                                ((f)->application == WACOM_HID_WD_PEN) || \
                                 ((f)->application == WACOM_HID_WD_DIGITIZER) || \
                                 ((f)->application == WACOM_HID_G9_PEN) || \
                                 ((f)->application == WACOM_HID_G11_PEN))
index ab05a86269dc1770181340b8b21c460d83412cb9..47dd962d9a7a5d002430f7158fb7f5339fe98839 100644 (file)
@@ -289,6 +289,7 @@ struct hid_item {
 #define HID_DG_DEVICEINDEX     0x000d0053
 #define HID_DG_CONTACTCOUNT    0x000d0054
 #define HID_DG_CONTACTMAX      0x000d0055
+#define HID_DG_SCANTIME                0x000d0056
 #define HID_DG_BUTTONTYPE      0x000d0059
 #define HID_DG_BARRELSWITCH2   0x000d005a
 #define HID_DG_TOOLSERIALNUMBER        0x000d005b