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

Commit d0afa195 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "HID: Adding new ids for hid-qvr support"

parents a50689a6 36de7f2f

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -2265,6 +2265,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
#if IS_ENABLED(CONFIG_HID_QVR)

	{ HID_USB_DEVICE(USB_VENDOR_ID_QVR5, USB_DEVICE_ID_QVR5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_QVR32A, USB_DEVICE_ID_QVR32A) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NREAL, USB_DEVICE_ID_NREAL) },

#endif

#if IS_ENABLED(CONFIG_HID_RETRODE)

	{ HID_USB_DEVICE(USB_VENDOR_ID_FUTURE_TECHNOLOGY, USB_DEVICE_ID_RETRODE2) },

drivers/hid/hid-ids.h

+2 −0
Original line number Diff line number Diff line
@@ -1186,7 +1186,9 @@ 


#define USB_VENDOR_ID_QVR5	0x045e

#define USB_VENDOR_ID_QVR32A	0x04b4

#define USB_VENDOR_ID_NREAL	0x05a9

#define USB_DEVICE_ID_QVR5	0x0659

#define USB_DEVICE_ID_QVR32A	0x00c3

#define USB_DEVICE_ID_NREAL	0x0680



#endif

drivers/hid/hid-qvr.c

+1 −0
Original line number Diff line number Diff line
@@ -580,6 +580,7 @@ static void qvr_external_sensor_device_remove(struct hid_device *hdev) 
static struct hid_device_id qvr_external_sensor_table[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_QVR5, USB_DEVICE_ID_QVR5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_QVR32A, USB_DEVICE_ID_QVR32A) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NREAL, USB_DEVICE_ID_NREAL) },

	{ }

};

MODULE_DEVICE_TABLE(hid, qvr_external_sensor_table);

drivers/hid/usbhid/hid-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_INNOMEDIA, USB_DEVICE_ID_INNEX_GENESIS_ATARI, HID_QUIRK_MULTI_INPUT },

	{ USB_VENDOR_ID_QVR5, USB_DEVICE_ID_QVR5, HID_QUIRK_HIDINPUT_FORCE },

	{ USB_VENDOR_ID_QVR32A, USB_DEVICE_ID_QVR32A, HID_QUIRK_HIDINPUT_FORCE },

	{ USB_VENDOR_ID_NREAL, USB_DEVICE_ID_NREAL, HID_QUIRK_HIDINPUT_FORCE },



	{ 0, 0 }

};