Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 89759e20d9571e0496c7e12fc4a3ce2a5233f18e

Authored by Adam Jiang
Committed by Jiri Kosina
1 parent d856501413
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches 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

HID: Add PID for Japanese version of NE4K keyboard 

This patche adds PID of Japanese Natual Ergonomic Keyboard 4000. HID
NE4K driver depends on this PID for determining its quirks. F14-F18 keys
would not work without the patch.

Signed-off-by: Adam Jiang <jiang.adam@gmail.com>
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-core.c
Diff comments   View file @ 89759e2
... ... @@ -1654,6 +1654,7 @@
1654 1654 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500) },
1655 1655 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },
1656 1656 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) },
  1657 + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K_JP) },
1657 1658 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },
1658 1659 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },
1659 1660 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },
drivers/hid/hid-ids.h
Diff comments   View file @ 89759e2
... ... @@ -575,6 +575,7 @@
575 575 #define USB_DEVICE_ID_SIDEWINDER_GV 0x003b
576 576 #define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d
577 577 #define USB_DEVICE_ID_MS_NE4K 0x00db
  578 +#define USB_DEVICE_ID_MS_NE4K_JP 0x00dc
578 579 #define USB_DEVICE_ID_MS_LK6K 0x00f9
579 580 #define USB_DEVICE_ID_MS_PRESENTER_8K_BT 0x0701
580 581 #define USB_DEVICE_ID_MS_PRESENTER_8K_USB 0x0713
drivers/hid/hid-microsoft.c
Diff comments   View file @ 89759e2
... ... @@ -195,6 +195,8 @@
195 195 .driver_data = MS_HIDINPUT },
196 196 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K),
197 197 .driver_data = MS_ERGONOMY },
  198 + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K_JP),
  199 + .driver_data = MS_ERGONOMY },
198 200 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K),
199 201 .driver_data = MS_ERGONOMY | MS_RDESC },
200 202 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB),