Commit 08115756 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.4/logitech' into for-linus 



- extension of supported usage range for customer page, as some Logitech
  devices are actually making use of it. From Olivier Gay.

- support for Lightspeed and G700(s) receivers from Filipe Laíns and
  Benjamin Tissoires

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parents 979d859d 5722f338

drivers/hid/hid-ids.h

+2 −1
Original line number Diff line number Diff line
@@ -770,7 +770,8 @@ 
#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER		0xc52f

#define USB_DEVICE_ID_LOGITECH_UNIFYING_RECEIVER_2	0xc532

#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_2		0xc534

#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED	0xc539

#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1	0xc539

#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1	0xc53f

#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_POWERPLAY	0xc53a

#define USB_DEVICE_ID_SPACETRAVELLER	0xc623

#define USB_DEVICE_ID_SPACENAVIGATOR	0xc626

drivers/hid/hid-logitech-dj.c

+18 −4
Original line number Diff line number Diff line
@@ -380,9 +380,9 @@ static const char consumer_descriptor[] = { 
	0x75, 0x10,		/* REPORT_SIZE (16)                    */

	0x95, 0x02,		/* REPORT_COUNT (2)                    */

	0x15, 0x01,		/* LOGICAL_MIN (1)                     */

	0x26, 0x8C, 0x02,	/* LOGICAL_MAX (652)                   */

	0x26, 0xFF, 0x02,	/* LOGICAL_MAX (767)                   */

	0x19, 0x01,		/* USAGE_MIN (1)                       */

	0x2A, 0x8C, 0x02,	/* USAGE_MAX (652)                     */

	0x2A, 0xFF, 0x02,	/* USAGE_MAX (767)                     */

	0x81, 0x00,		/* INPUT (Data Ary Abs)                */

	0xC0,			/* END_COLLECTION                      */

};				/*                                     */
@@ -959,6 +959,7 @@ static void logi_hidpp_recv_queue_notif(struct hid_device *hdev, 
		break;

	case 0x07:

		device_type = "eQUAD step 4 Gaming";

		logi_hidpp_dev_conn_notif_equad(hdev, hidpp_report, &workitem);

		break;

	case 0x08:

		device_type = "eQUAD step 4 for gamepads";
@@ -968,7 +969,12 @@ static void logi_hidpp_recv_queue_notif(struct hid_device *hdev, 
		logi_hidpp_dev_conn_notif_equad(hdev, hidpp_report, &workitem);

		break;

	case 0x0c:

		device_type = "eQUAD Lightspeed";

		device_type = "eQUAD Lightspeed 1";

		logi_hidpp_dev_conn_notif_equad(hdev, hidpp_report, &workitem);

		workitem.reports_supported |= STD_KEYBOARD;

		break;

	case 0x0d:

		device_type = "eQUAD Lightspeed 1_1";

		logi_hidpp_dev_conn_notif_equad(hdev, hidpp_report, &workitem);

		workitem.reports_supported |= STD_KEYBOARD;

		break;
@@ -1832,9 +1838,17 @@ static const struct hid_device_id logi_dj_receivers[] = { 
	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,

			 USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_2),

	 .driver_data = recvr_type_hidpp},

	{ /* Logitech G700(s) receiver (0xc531) */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,

		0xc531),

	 .driver_data = recvr_type_gaming_hidpp},

	{ /* Logitech lightspeed receiver (0xc539) */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,

		USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED),

		USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1),

	 .driver_data = recvr_type_gaming_hidpp},

	{ /* Logitech lightspeed receiver (0xc53f) */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH,

		USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1),

	 .driver_data = recvr_type_gaming_hidpp},

	{ /* Logitech 27 MHz HID++ 1.0 receiver (0xc513) */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER),