Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba4d8abb authored by Stephane Chatty's avatar Stephane Chatty Committed by Jiri Kosina
Browse files

HID: Support for the 11.6" Cando panel 



Added support for the 11.6" Cando panel found on the Acer Timeline 1825PTZ.

Signed-off-by: default avatarStephane Chatty <chatty@enac.fr>
Tested-by: default avatarJohannes Klug <johannesklug@room2web.de>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 653efbb4

drivers/hid/hid-cando.c

+2 −0
Original line number Diff line number Diff line
@@ -235,6 +235,8 @@ static void cando_remove(struct hid_device *hdev) 
static const struct hid_device_id cando_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO,

			USB_DEVICE_ID_CANDO_MULTI_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO,

			USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },

	{ }

};

MODULE_DEVICE_TABLE(hid, cando_devices);

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1296,6 +1296,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ 


#define USB_VENDOR_ID_CANDO		0x2087

#define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01

#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03



#define USB_VENDOR_ID_CH		0x068e

#define USB_DEVICE_ID_CH_PRO_PEDALS	0x00f2