Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 578f3a35fecabff49bad808c5301313f785b5462

Authored by Jiri Kosina
1 parent 06d2148ed3
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 USB ID for another dual gameron adapter 

0x0810/0x0002 needs the very same handling as 0x0001.

Reported-by: Steve Conklin <sconklin@canonical.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 @ 578f3a3
... ... @@ -1267,6 +1267,7 @@
1267 1267 { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
1268 1268 { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },
1269 1269 { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
  1270 + { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },
1270 1271 { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },
1271 1272 { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
1272 1273 { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
drivers/hid/hid-ids.h
Diff comments   View file @ 578f3a3
... ... @@ -163,6 +163,7 @@
163 163  
164 164 #define USB_VENDOR_ID_GAMERON 0x0810
165 165 #define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR 0x0001
  166 +#define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR 0x0002
166 167  
167 168 #define USB_VENDOR_ID_GENERAL_TOUCH 0x0dfc
168 169  
drivers/hid/hid-pl.c
Diff comments   View file @ 578f3a3
... ... @@ -178,6 +178,8 @@
178 178 static const struct hid_device_id pl_devices[] = {
179 179 { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR),
180 180 .driver_data = 1 }, /* Twin USB Joystick */
  181 + { HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR),
  182 + .driver_data = 1 }, /* Twin USB Joystick */
181 183 { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003), }, /* GreenAsia Inc. USB Joystick */
182 184 { }
183 185 };