RE: [PATCH] Add VID/PID for HID-type Multi-Touch Module of AFO CO., LTD.
From: Jiri Kosina <hidden>
Date: 2014-03-28 23:17:11
Also in:
lkml
On Wed, 26 Mar 2014, YongHwan Ki wrote:
quoted hunk ↗ jump to hunk
Sorry, I woud like to add the AFO defines in the Linux Kernel. No afo defines exists in the current kernel tree. I correctly changed the log for adding the afo defines. Kernel Version : linux-3.14.rc7 Signed-off-by: Yonghwan Ki <redacted> diff -uprN -X Documentation/dontdiff ./drivers/hid/hid-core.c ../linux-3.14-rc7m/drivers/hid/hid-core.c--- ./drivers/hid/hid-core.c 2014-03-17 10:51:24.000000000 +0900 +++ ../linux-3.14-rc7m/drivers/hid/hid-core.c 2014-03-21 17:41:51.846939444 +0900@@ -1881,6 +1881,8 @@ static const struct hid_device_id hid_ha { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) }, { HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) }, { HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) }, + { HID_USB_DEVICE(USB_VENDOR_ID_AFO, USB_DEVICE_ID_AFO_TCM) }, + { HID_USB_DEVICE(USB_VENDOR_ID_AFO, USB_DEVICE_ID_AFO_THM) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) },diff -uprN -X Documentation/dontdiff ./drivers/hid/hid-ids.h ../linux-3.14-rc7m/drivers/hid/hid-ids.h--- ./drivers/hid/hid-ids.h 2014-03-17 10:51:24.000000000 +0900 +++ ../linux-3.14-rc7m/drivers/hid/hid-ids.h 2014-03-21 17:30:34.478959555 +0900@@ -960,5 +960,9 @@ #define USB_VENDOR_ID_PRIMAX 0x0461 #define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05 +#define USB_VENDOR_ID_AFO 0x2576 +#define USB_DEVICE_ID_AFO_TCM 0x0003 +#define USB_DEVICE_ID_AFO_BL 0x0005 +#define USB_DEVICE_ID_AFO_THM 0x0011 #endifdiff -uprN -X Documentation/dontdiff ./drivers/hid/hid-multitouch.c ../linux-3.14-rc7m/drivers/hid/hid-multitouch.c--- ./drivers/hid/hid-multitouch.c 2014-03-17 10:51:24.000000000 +0900 +++ ../linux-3.14-rc7m/drivers/hid/hid-multitouch.c 2014-03-21 17:45:25.946933088 +0900@@ -1395,6 +1395,15 @@ static const struct hid_device_id mt_dev { .driver_data = MT_CLS_WIN_8, HID_DEVICE(HID_BUS_ANY, HID_GROUP_MULTITOUCH_WIN_8, HID_ANY_ID, HID_ANY_ID) }, + + /* AFO MultiTouch device */ + { .driver_data = MT_CLS_SERIAL, + HID_USB_DEVICE(USB_VENDOR_ID_AFO, + USB_DEVICE_ID_AFO_TCM) }, + { .driver_data = MT_CLS_SERIAL, + HID_USB_DEVICE(USB_VENDOR_ID_AFO, + USB_DEVICE_ID_AFO_THM) }, + { } }; MODULE_DEVICE_TABLE(hid, mt_devices);Binary files ./kernel/x509_certificate_list and ../linux-3.14-rc7m/kernel/x509_certificate_list differdiff -uprN -X Documentation/dontdiff ./lib/oid_registry_data.c ../linux-3.14-rc7m/lib/oid_registry_data.c--- ./lib/oid_registry_data.c 2014-03-21 18:45:37.598825862 +0900 +++ ../linux-3.14-rc7m/lib/oid_registry_data.c 2014-03-24 21:43:59.826812763 +0900@@ -1,5 +1,5 @@ /* - * Automatically generated by /usr/src/linux-3.14-rc7/lib/build_OID_registry. Do not edit + * Automatically generated by /usr/src/linux-3.14-rc7m/lib/build_OID_registry. Do not edit
Please remove this hunk, it has nothing to do with the patchset.
quoted hunk ↗ jump to hunk
*/ static const unsigned short oid_index[OID__NR + 1] = { diff -uprN -X Documentation/dontdiff ./signing_key.priv ../linux-3.14-rc7m/signing_key.priv--- ./signing_key.priv 2014-03-21 17:24:11.874970914 +0900 +++ ../linux-3.14-rc7m/signing_key.priv 2014-03-24 20:22:01.946958769 +0900@@ -1,52 +1,52 @@ -----BEGIN PRIVATE KEY-----
Again, I don't think you want to be sending this out :) Thanks, -- Jiri Kosina SUSE Labs