Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 272036edb77e5967c175ac48b8c88e9b3358285f

Authored by François Jaouen
Committed by Jiri Kosina
1 parent e1f092102f
Exists in master and in 7 other branches 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, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

HID: Add Cando touch screen 15.6-inch product id 

This add the product id of the touch screen found on ACER Aspire 5738PZ.  Works
with hid-cando driver.

Signed-off-by: Francois Jaouen<francois.jaouen@laposte.net>
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 @ 272036e
... ... @@ -237,6 +237,8 @@
237 237 USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
238 238 { HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
239 239 USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
  240 + { HID_USB_DEVICE(USB_VENDOR_ID_CANDO,
  241 + USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },
240 242 { }
241 243 };
242 244 MODULE_DEVICE_TABLE(hid, cando_devices);
drivers/hid/hid-core.c
Diff comments   View file @ 272036e
... ... @@ -1292,6 +1292,7 @@
1292 1292 { HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },
1293 1293 { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
1294 1294 { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
  1295 + { HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },
1295 1296 { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
1296 1297 { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
1297 1298 { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
drivers/hid/hid-ids.h
Diff comments   View file @ 272036e
... ... @@ -134,6 +134,7 @@
134 134 #define USB_VENDOR_ID_CANDO 0x2087
135 135 #define USB_DEVICE_ID_CANDO_MULTI_TOUCH 0x0a01
136 136 #define USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6 0x0b03
  137 +#define USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6 0x0f01
137 138  
138 139 #define USB_VENDOR_ID_CH 0x068e
139 140 #define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2