]>
Commit | Line | Data |
---|---|---|
2bb7416c GKH |
1 | From 3e83eda467050f13fa69d888993458b76e733de9 Mon Sep 17 00:00:00 2001 |
2 | From: Aaron Ma <aaron.ma@canonical.com> | |
3 | Date: Mon, 9 Apr 2018 15:41:31 +0800 | |
4 | Subject: HID: i2c-hid: Fix resume issue on Raydium touchscreen device | |
5 | ||
6 | From: Aaron Ma <aaron.ma@canonical.com> | |
7 | ||
8 | commit 3e83eda467050f13fa69d888993458b76e733de9 upstream. | |
9 | ||
10 | When Rayd touchscreen resumed from S3, it issues too many errors like: | |
11 | i2c_hid i2c-RAYD0001:00: i2c_hid_get_input: incomplete report (58/5442) | |
12 | ||
13 | And all the report data are corrupted, touchscreen is unresponsive. | |
14 | ||
15 | Fix this by re-sending report description command after resume. | |
16 | Add device ID as a quirk. | |
17 | ||
18 | Cc: stable@vger.kernel.org | |
19 | Signed-off-by: Aaron Ma <aaron.ma@canonical.com> | |
20 | Signed-off-by: Jiri Kosina <jkosina@suse.cz> | |
21 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
22 | ||
23 | --- | |
24 | drivers/hid/hid-ids.h | 3 +++ | |
25 | drivers/hid/i2c-hid/i2c-hid.c | 13 +++++++++++++ | |
26 | 2 files changed, 16 insertions(+) | |
27 | ||
28 | --- a/drivers/hid/hid-ids.h | |
29 | +++ b/drivers/hid/hid-ids.h | |
30 | @@ -519,6 +519,9 @@ | |
31 | #define I2C_VENDOR_ID_HANTICK 0x0911 | |
32 | #define I2C_PRODUCT_ID_HANTICK_5288 0x5288 | |
33 | ||
34 | +#define I2C_VENDOR_ID_RAYD 0x2386 | |
35 | +#define I2C_PRODUCT_ID_RAYD_3118 0x3118 | |
36 | + | |
37 | #define USB_VENDOR_ID_HANWANG 0x0b57 | |
38 | #define USB_DEVICE_ID_HANWANG_TABLET_FIRST 0x5000 | |
39 | #define USB_DEVICE_ID_HANWANG_TABLET_LAST 0x8fff | |
40 | --- a/drivers/hid/i2c-hid/i2c-hid.c | |
41 | +++ b/drivers/hid/i2c-hid/i2c-hid.c | |
42 | @@ -47,6 +47,7 @@ | |
43 | /* quirks to control the device */ | |
44 | #define I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV BIT(0) | |
45 | #define I2C_HID_QUIRK_NO_IRQ_AFTER_RESET BIT(1) | |
46 | +#define I2C_HID_QUIRK_RESEND_REPORT_DESCR BIT(2) | |
47 | ||
48 | /* flags */ | |
49 | #define I2C_HID_STARTED 0 | |
50 | @@ -171,6 +172,8 @@ static const struct i2c_hid_quirks { | |
51 | I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV }, | |
52 | { I2C_VENDOR_ID_HANTICK, I2C_PRODUCT_ID_HANTICK_5288, | |
53 | I2C_HID_QUIRK_NO_IRQ_AFTER_RESET }, | |
54 | + { I2C_VENDOR_ID_RAYD, I2C_PRODUCT_ID_RAYD_3118, | |
55 | + I2C_HID_QUIRK_RESEND_REPORT_DESCR }, | |
56 | { 0, 0 } | |
57 | }; | |
58 | ||
59 | @@ -1220,6 +1223,16 @@ static int i2c_hid_resume(struct device | |
60 | if (ret) | |
61 | return ret; | |
62 | ||
63 | + /* RAYDIUM device (2386:3118) need to re-send report descr cmd | |
64 | + * after resume, after this it will be back normal. | |
65 | + * otherwise it issues too many incomplete reports. | |
66 | + */ | |
67 | + if (ihid->quirks & I2C_HID_QUIRK_RESEND_REPORT_DESCR) { | |
68 | + ret = i2c_hid_command(client, &hid_report_descr_cmd, NULL, 0); | |
69 | + if (!ret) | |
70 | + return ret; | |
71 | + } | |
72 | + | |
73 | if (hid->driver && hid->driver->reset_resume) { | |
74 | ret = hid->driver->reset_resume(hid); | |
75 | return ret; |