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

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

Merge "arm64: defconfig: Enable QVR HID driver on Lahaina"

parents e86a3710 b30ed4d2

arch/arm64/configs/vendor/lahaina_QGKI.config

+1 −0
Original line number Diff line number Diff line
@@ -165,3 +165,4 @@ CONFIG_MMC_SDHCI_MSM=m 
CONFIG_DUMMY=y

CONFIG_IOSCHED_BFQ=y

CONFIG_BFQ_GROUP_IOSCHED=y

CONFIG_HID_QVR=y

drivers/hid/hid-ids.h

+4 −0
Original line number Diff line number Diff line
@@ -1276,6 +1276,10 @@ 
#define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011	0x0018



#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-quirks.c

+7 −1
Original line number Diff line number Diff line
@@ -176,6 +176,10 @@ static const struct hid_device_id hid_quirks[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_QVR5, USB_DEVICE_ID_QVR5),

	HID_QUIRK_HIDINPUT_FORCE | HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },

	{ HID_USB_DEVICE(USB_VENDOR_ID_QVR32A, USB_DEVICE_ID_QVR32A),

	HID_QUIRK_HIDINPUT_FORCE | HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NREAL, USB_DEVICE_ID_NREAL),

	HID_QUIRK_HIDINPUT_FORCE | HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE },



	{ 0 }

};
@@ -566,6 +570,8 @@ static const struct hid_device_id hid_have_special_driver[] = { 
#endif

#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-qvr.c

+5 −1
Original line number Diff line number Diff line
@@ -415,7 +415,9 @@ static ssize_t fd_show(struct kobject *kobj, 
	struct kobj_attribute *attr,

	char *buf)

{

	return snprintf(buf, 16, "%d\n", fd);

	struct qvr_external_sensor *sensor = &qvr_external_sensor;



	return scnprintf(buf, 16, "%d\n", sensor->fd);

}



static ssize_t fd_store(struct kobject *kobj,
@@ -619,6 +621,8 @@ 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/hid-qvr.h

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
#ifndef HID_QVR_H_FILE

#define HID_QVR_H_FILE



#define USB_VENDOR_ID_QVR5	0x045e

#define USB_DEVICE_ID_QVR5	0x0659

#define QVR_EXTERNAL_SENSOR_REPORT_ID 0x1



//CMD IDs