Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ba4d8abb31def963f49b7c239a8acce57fe1d1cc

Authored by Stephane Chatty
Committed by Jiri Kosina
1 parent 653efbb4b2
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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: Stephane Chatty <chatty@enac.fr>
Tested-by: Johannes Klug <johannesklug@room2web.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Showing 3 changed files with 4 additions and 0 deletions Side-by-side Diff

drivers/hid/hid-cando.c
Diff comments   View file @ ba4d8ab
... ... @@ -235,6 +235,8 @@
235 235 static const struct hid_device_id cando_devices[] = {
236 236 { HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
237 237 USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
  238 + { HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
  239 + USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
238 240 { }
239 241 };
240 242 MODULE_DEVICE_TABLE(hid, cando_devices);
drivers/hid/hid-core.c
Diff comments   View file @ ba4d8ab
... ... @@ -1296,6 +1296,7 @@
1296 1296 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
1297 1297 { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
1298 1298 { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
  1299 + { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
1299 1300 { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
1300 1301 { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
1301 1302 { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
drivers/hid/hid-ids.h
Diff comments   View file @ ba4d8ab
... ... @@ -125,6 +125,7 @@
125 125  
126 126 #define USB_VENDOR_ID_CANDO 0x2087
127 127 #define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01
  128 +#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03
128 129  
129 130 #define USB_VENDOR_ID_CH 0x068e
130 131 #define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2