|
 |
a851a57 |
From 98f07385212073536f303c07ece455acdd4d267f Mon Sep 17 00:00:00 2001
|
|
|
a851a57 |
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9=20=D0=9A=D1=83?=
|
|
|
a851a57 |
=?UTF-8?q?=D0=B4=D1=80=D1=8F=D0=B2=D1=86=D0=B5=D0=B2?=
|
|
|
a851a57 |
<nkudriavtsev@gmail.com>
|
|
|
a851a57 |
Date: Tue, 21 Jul 2015 13:31:52 +0300
|
|
|
a851a57 |
Subject: [PATCH] HID: chicony: Add support for Acer Aspire Switch 12
|
|
|
a851a57 |
|
|
|
a851a57 |
Acer Aspire Switch 12 keyboard Chicony's controller reports too big usage
|
|
|
a851a57 |
index on the 1st interface. The patch fixes the report. The work based on
|
|
|
a851a57 |
solution from drivers/hid/hid-holtek-mouse.c
|
|
|
a851a57 |
|
|
|
a851a57 |
Bug report: https://bugzilla.kernel.org/show_bug.cgi?id=101721
|
|
|
a851a57 |
|
|
|
a851a57 |
Signed-off-by: Nicholas Kudriavtsev <nkudriavtsev@gmail.com>
|
|
|
a851a57 |
Signed-off-by: Jiri Kosina <jkosina@suse.com>
|
|
|
a851a57 |
---
|
|
|
a851a57 |
drivers/hid/hid-chicony.c | 26 ++++++++++++++++++++++++++
|
|
|
a851a57 |
drivers/hid/hid-core.c | 1 +
|
|
|
a851a57 |
drivers/hid/hid-ids.h | 1 +
|
|
|
a851a57 |
3 files changed, 28 insertions(+)
|
|
|
a851a57 |
|
|
|
a851a57 |
diff --git a/drivers/hid/hid-chicony.c b/drivers/hid/hid-chicony.c
|
|
|
a851a57 |
index b613d5a79684..bc3cec199fee 100644
|
|
|
a851a57 |
--- a/drivers/hid/hid-chicony.c
|
|
|
a851a57 |
+++ b/drivers/hid/hid-chicony.c
|
|
|
a851a57 |
@@ -20,6 +20,7 @@
|
|
|
a851a57 |
#include <linux/input.h>
|
|
|
a851a57 |
#include <linux/hid.h>
|
|
|
a851a57 |
#include <linux/module.h>
|
|
|
a851a57 |
+#include <linux/usb.h>
|
|
|
a851a57 |
|
|
|
a851a57 |
#include "hid-ids.h"
|
|
|
a851a57 |
|
|
|
a851a57 |
@@ -57,10 +58,34 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
|
|
|
a851a57 |
return 1;
|
|
|
a851a57 |
}
|
|
|
a851a57 |
|
|
|
a851a57 |
+static __u8 *ch_switch12_report_fixup(struct hid_device *hdev, __u8 *rdesc,
|
|
|
a851a57 |
+ unsigned int *rsize)
|
|
|
a851a57 |
+{
|
|
|
a851a57 |
+ struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
|
|
|
a851a57 |
+
|
|
|
a851a57 |
+ if (intf->cur_altsetting->desc.bInterfaceNumber == 1) {
|
|
|
a851a57 |
+ /* Change usage maximum and logical maximum from 0x7fff to
|
|
|
a851a57 |
+ * 0x2fff, so they don't exceed HID_MAX_USAGES */
|
|
|
a851a57 |
+ switch (hdev->product) {
|
|
|
a851a57 |
+ case USB_DEVICE_ID_CHICONY_ACER_SWITCH12:
|
|
|
a851a57 |
+ if (*rsize >= 128 && rdesc[64] == 0xff && rdesc[65] == 0x7f
|
|
|
a851a57 |
+ && rdesc[69] == 0xff && rdesc[70] == 0x7f) {
|
|
|
a851a57 |
+ hid_info(hdev, "Fixing up report descriptor\n");
|
|
|
a851a57 |
+ rdesc[65] = rdesc[70] = 0x2f;
|
|
|
a851a57 |
+ }
|
|
|
a851a57 |
+ break;
|
|
|
a851a57 |
+ }
|
|
|
a851a57 |
+
|
|
|
a851a57 |
+ }
|
|
|
a851a57 |
+ return rdesc;
|
|
|
a851a57 |
+}
|
|
|
a851a57 |
+
|
|
|
a851a57 |
+
|
|
|
a851a57 |
static const struct hid_device_id ch_devices[] = {
|
|
|
a851a57 |
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
|
|
|
a851a57 |
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },
|
|
|
a851a57 |
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) },
|
|
|
a851a57 |
+ { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_ACER_SWITCH12) },
|
|
|
a851a57 |
{ }
|
|
|
a851a57 |
};
|
|
|
a851a57 |
MODULE_DEVICE_TABLE(hid, ch_devices);
|
|
|
a851a57 |
@@ -68,6 +93,7 @@ MODULE_DEVICE_TABLE(hid, ch_devices);
|
|
|
a851a57 |
static struct hid_driver ch_driver = {
|
|
|
a851a57 |
.name = "chicony",
|
|
|
a851a57 |
.id_table = ch_devices,
|
|
|
a851a57 |
+ .report_fixup = ch_switch12_report_fixup,
|
|
|
a851a57 |
.input_mapping = ch_input_mapping,
|
|
|
a851a57 |
};
|
|
|
a851a57 |
module_hid_driver(ch_driver);
|
|
|
a851a57 |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
|
|
|
a851a57 |
index e6fce23b121a..f90ca6574221 100644
|
|
|
a851a57 |
--- a/drivers/hid/hid-core.c
|
|
|
a851a57 |
+++ b/drivers/hid/hid-core.c
|
|
|
a851a57 |
@@ -1807,6 +1807,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
|
|
a851a57 |
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) },
|
|
|
a851a57 |
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },
|
|
|
a851a57 |
{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) },
|
|
|
a851a57 |
+ { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_ACER_SWITCH12) },
|
|
|
a851a57 |
{ HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },
|
|
|
a851a57 |
{ HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_CP2112) },
|
|
|
a851a57 |
{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
|
|
|
a851a57 |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
|
|
a851a57 |
index b3b225b75d0a..79210ca8eff1 100644
|
|
|
a851a57 |
--- a/drivers/hid/hid-ids.h
|
|
|
a851a57 |
+++ b/drivers/hid/hid-ids.h
|
|
|
a851a57 |
@@ -233,6 +233,7 @@
|
|
|
a851a57 |
#define USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE 0x1053
|
|
|
a851a57 |
#define USB_DEVICE_ID_CHICONY_WIRELESS2 0x1123
|
|
|
a851a57 |
#define USB_DEVICE_ID_CHICONY_AK1D 0x1125
|
|
|
a851a57 |
+#define USB_DEVICE_ID_CHICONY_ACER_SWITCH12 0x1421
|
|
|
a851a57 |
|
|
|
a851a57 |
#define USB_VENDOR_ID_CHUNGHWAT 0x2247
|
|
|
a851a57 |
#define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH 0x0001
|
|
|
a851a57 |
--
|
|
|
a851a57 |
2.4.3
|
|
|
a851a57 |
|