Input: elan_i2c - add new trackpoint report type 0x5F

The 0x5F is a new trackpoint report type used by some modules.

Signed-off-by: Jingle Wu <jingle.wu@emc.com.tw>
Link: https://lore.kernel.org/r/20201211071511.32349-1-jingle.wu@emc.com.tw
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/mouse/elan_i2c.h b/drivers/input/mouse/elan_i2c.h
index c75b00c..84bb386 100644 (file)
--- a/drivers/input/mouse/elan_i2c.h
+++ b/drivers/input/mouse/elan_i2c.h
@@ -28,6 +28,22 @@
 
 #define ETP_FEATURE_REPORT_MK  BIT(0)
 
+#define ETP_REPORT_ID          0x5D
+#define ETP_TP_REPORT_ID       0x5E
+#define ETP_TP_REPORT_ID2      0x5F
+#define ETP_REPORT_ID2         0x60    /* High precision report */
+
+#define ETP_REPORT_ID_OFFSET   2
+#define ETP_TOUCH_INFO_OFFSET  3
+#define ETP_FINGER_DATA_OFFSET 4
+#define ETP_HOVER_INFO_OFFSET  30
+#define ETP_MK_DATA_OFFSET     33      /* For high precision reports */
+
+#define ETP_MAX_REPORT_LEN     39
+
+#define ETP_MAX_FINGERS                5
+#define ETP_FINGER_DATA_LEN    5
+
 /* IAP Firmware handling */
 #define ETP_PRODUCT_ID_FORMAT_STRING   "%d.0"
 #define ETP_FW_NAME            "elan_i2c_" ETP_PRODUCT_ID_FORMAT_STRING ".bin"

diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 65d21a0..3a8b9e8 100644 (file)
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -46,18 +46,6 @@
 #define ETP_FINGER_WIDTH       15
 #define ETP_RETRY_COUNT                3
 
-#define ETP_MAX_FINGERS                5
-#define ETP_FINGER_DATA_LEN    5
-#define ETP_REPORT_ID          0x5D
-#define ETP_REPORT_ID2         0x60    /* High precision report */
-#define ETP_TP_REPORT_ID       0x5E
-#define ETP_REPORT_ID_OFFSET   2
-#define ETP_TOUCH_INFO_OFFSET  3
-#define ETP_FINGER_DATA_OFFSET 4
-#define ETP_HOVER_INFO_OFFSET  30
-#define ETP_MK_DATA_OFFSET     33      /* For high precision reports */
-#define ETP_MAX_REPORT_LEN     39
-
 /* The main device structure */
 struct elan_tp_data {
        struct i2c_client       *client;
@@ -1074,6 +1062,7 @@ static irqreturn_t elan_isr(int irq, void *dev_id)
                elan_report_absolute(data, report, true);
                break;
        case ETP_TP_REPORT_ID:
+       case ETP_TP_REPORT_ID2:
                elan_report_trackpoint(data, report);
                break;
        default:

diff --git a/drivers/input/mouse/elan_i2c_smbus.c b/drivers/input/mouse/elan_i2c_smbus.c
index 8ff8237..1f38fab 100644 (file)
--- a/drivers/input/mouse/elan_i2c_smbus.c
+++ b/drivers/input/mouse/elan_i2c_smbus.c
@@ -45,6 +45,7 @@
 #define ETP_SMBUS_CALIBRATE_QUERY      0xC5
 
 #define ETP_SMBUS_REPORT_LEN           32
+#define ETP_SMBUS_REPORT_LEN2          7
 #define ETP_SMBUS_REPORT_OFFSET                2
 #define ETP_SMBUS_HELLOPACKET_LEN      5
 #define ETP_SMBUS_IAP_PASSWORD         0x1234
@@ -497,10 +498,13 @@ static int elan_smbus_get_report(struct i2c_client *client,
                return len;
        }
 
-       if (len != ETP_SMBUS_REPORT_LEN) {
+       if (report[ETP_REPORT_ID_OFFSET] == ETP_TP_REPORT_ID2)
+               report_len = ETP_SMBUS_REPORT_LEN2;
+
+       if (len != report_len) {
                dev_err(&client->dev,
                        "wrong report length (%d vs %d expected)\n",
-                       len, ETP_SMBUS_REPORT_LEN);
+                       len, report_len);
                return -EIO;
        }