Merge branch 'for-4.19/elan' into for-linus

Resolution/pressure fixes and new device support for hid-elan

2 files changed, 184 insertions, 53 deletions

diff --git a/drivers/hid/hid-elan.c b/drivers/hid/hid-elan.c
index 803a725785cf..07e26c3567eb 100644
--- a/drivers/hid/hid-elan.c
+++ b/drivers/hid/hid-elan.c
@@ -19,38 +19,49 @@
 
 #include "hid-ids.h"
 
+#define ELAN_MT_I2C             0x5d
 #define ELAN_SINGLE_FINGER      0x81
 #define ELAN_MT_FIRST_FINGER    0x82
 #define ELAN_MT_SECOND_FINGER   0x83
 #define ELAN_INPUT_REPORT_SIZE  8
+#define ELAN_I2C_REPORT_SIZE    32
+#define ELAN_FINGER_DATA_LEN    5
+#define ELAN_MAX_FINGERS        5
+#define ELAN_MAX_PRESSURE       255
+#define ELAN_TP_USB_INTF        1
+
+#define ELAN_FEATURE_REPORT     0x0d
+#define ELAN_FEATURE_SIZE       5
+#define ELAN_PARAM_MAX_X        6
+#define ELAN_PARAM_MAX_Y        7
+#define ELAN_PARAM_RES          8
 
 #define ELAN_MUTE_LED_REPORT    0xBC
 #define ELAN_LED_REPORT_SIZE    8
 
-struct elan_touchpad_settings {
-        u8 max_fingers;
-        u16 max_x;
-        u16 max_y;
-        u8 max_area_x;
-        u8 max_area_y;
-        u8 max_w;
-        int usb_bInterfaceNumber;
-};
+#define ELAN_HAS_LED            BIT(0)
 
 struct elan_drvdata {
         struct input_dev *input;
         u8 prev_report[ELAN_INPUT_REPORT_SIZE];
         struct led_classdev mute_led;
         u8 mute_led_state;
-        struct elan_touchpad_settings *settings;
+        u16 max_x;
+        u16 max_y;
+        u16 res_x;
+        u16 res_y;
 };
 
 static int is_not_elan_touchpad(struct hid_device *hdev)
 {
-        struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
-        struct elan_drvdata *drvdata = hid_get_drvdata(hdev);
+        if (hdev->bus == BUS_USB) {
+                struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
+
+                return (intf->altsetting->desc.bInterfaceNumber !=
+                        ELAN_TP_USB_INTF);
+        }
 
-        return (intf->altsetting->desc.bInterfaceNumber != drvdata->settings->usb_bInterfaceNumber);
+        return 0;
 }
 
 static int elan_input_mapping(struct hid_device *hdev, struct hid_input *hi,
@@ -62,12 +73,86 @@ static int elan_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 
         if (field->report->id == ELAN_SINGLE_FINGER ||
             field->report->id == ELAN_MT_FIRST_FINGER ||
-            field->report->id == ELAN_MT_SECOND_FINGER)
+            field->report->id == ELAN_MT_SECOND_FINGER ||
+            field->report->id == ELAN_MT_I2C)
                 return -1;
 
         return 0;
 }
 
+static int elan_get_device_param(struct hid_device *hdev,
+                                 unsigned char *dmabuf, unsigned char param)
+{
+        int ret;
+
+        dmabuf[0] = ELAN_FEATURE_REPORT;
+        dmabuf[1] = 0x05;
+        dmabuf[2] = 0x03;
+        dmabuf[3] = param;
+        dmabuf[4] = 0x01;
+
+        ret = hid_hw_raw_request(hdev, ELAN_FEATURE_REPORT, dmabuf,
+                                 ELAN_FEATURE_SIZE, HID_FEATURE_REPORT,
+                                 HID_REQ_SET_REPORT);
+        if (ret != ELAN_FEATURE_SIZE) {
+                hid_err(hdev, "Set report error for parm %d: %d\n", param, ret);
+                return ret;
+        }
+
+        ret = hid_hw_raw_request(hdev, ELAN_FEATURE_REPORT, dmabuf,
+                                 ELAN_FEATURE_SIZE, HID_FEATURE_REPORT,
+                                 HID_REQ_GET_REPORT);
+        if (ret != ELAN_FEATURE_SIZE) {
+                hid_err(hdev, "Get report error for parm %d: %d\n", param, ret);
+                return ret;
+        }
+
+        return 0;
+}
+
+static unsigned int elan_convert_res(char val)
+{
+        /*
+         * (value from firmware) * 10 + 790 = dpi
+         * dpi * 10 / 254 = dots/mm
+         */
+        return (val * 10 + 790) * 10 / 254;
+}
+
+static int elan_get_device_params(struct hid_device *hdev)
+{
+        struct elan_drvdata *drvdata = hid_get_drvdata(hdev);
+        unsigned char *dmabuf;
+        int ret;
+
+        dmabuf = kmalloc(ELAN_FEATURE_SIZE, GFP_KERNEL);
+        if (!dmabuf)
+                return -ENOMEM;
+
+        ret = elan_get_device_param(hdev, dmabuf, ELAN_PARAM_MAX_X);
+        if (ret)
+                goto err;
+
+        drvdata->max_x = (dmabuf[4] << 8) | dmabuf[3];
+
+        ret = elan_get_device_param(hdev, dmabuf, ELAN_PARAM_MAX_Y);
+        if (ret)
+                goto err;
+
+        drvdata->max_y = (dmabuf[4] << 8) | dmabuf[3];
+
+        ret = elan_get_device_param(hdev, dmabuf, ELAN_PARAM_RES);
+        if (ret)
+                goto err;
+
+        drvdata->res_x = elan_convert_res(dmabuf[3]);
+        drvdata->res_y = elan_convert_res(dmabuf[4]);
+
+err:
+        kfree(dmabuf);
+        return ret;
+}
+
 static int elan_input_configured(struct hid_device *hdev, struct hid_input *hi)
 {
         int ret;
@@ -77,6 +162,10 @@ static int elan_input_configured(struct hid_device *hdev, struct hid_input *hi)
         if (is_not_elan_touchpad(hdev))
                 return 0;
 
+        ret = elan_get_device_params(hdev);
+        if (ret)
+                return ret;
+
         input = devm_input_allocate_device(&hdev->dev);
         if (!input)
                 return -ENOMEM;
@@ -90,25 +179,25 @@ static int elan_input_configured(struct hid_device *hdev, struct hid_input *hi)
         input->id.version = hdev->version;
         input->dev.parent = &hdev->dev;
 
-        input_set_abs_params(input, ABS_MT_POSITION_X, 0,
-                             drvdata->settings->max_x, 0, 0);
-        input_set_abs_params(input, ABS_MT_POSITION_Y, 0,
-                             drvdata->settings->max_y, 0, 0);
-        input_set_abs_params(input, ABS_MT_TOUCH_MAJOR, 0,
-                             drvdata->settings->max_fingers, 0, 0);
-        input_set_abs_params(input, ABS_TOOL_WIDTH, 0,
-                             drvdata->settings->max_w, 0, 0);
+        input_set_abs_params(input, ABS_MT_POSITION_X, 0, drvdata->max_x,
+                             0, 0);
+        input_set_abs_params(input, ABS_MT_POSITION_Y, 0, drvdata->max_y,
+                             0, 0);
+        input_set_abs_params(input, ABS_MT_PRESSURE, 0, ELAN_MAX_PRESSURE,
+                             0, 0);
 
         __set_bit(BTN_LEFT, input->keybit);
         __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
 
-        ret = input_mt_init_slots(input, drvdata->settings->max_fingers,
-                                  INPUT_MT_POINTER);
+        ret = input_mt_init_slots(input, ELAN_MAX_FINGERS, INPUT_MT_POINTER);
         if (ret) {
                 hid_err(hdev, "Failed to init elan MT slots: %d\n", ret);
                 return ret;
         }