Commit 15d90b24 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid 

Pull HID fixes from Jiri Kosina:

 - a few regression fixes for wacom driver (including fix for my earlier
   mismerge) from Aaron Armstrong Skomra and Jason Gerecke

 - revert of a few Logitech device ID additions which turn out to not
   work perfectly with the hidpp driver at the moment; proper support is
   now scheduled for 5.4. Fixes from Benjamin Tissoires

 - scheduling-in-atomic fix for cp2112 driver, from Benjamin Tissoires

 - new device ID to intel-ish, from Even Xu

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: wacom: correct misreported EKR ring values
  HID: cp2112: prevent sleeping function called from invalid context
  HID: intel-ish-hid: ipc: add EHL device id
  HID: wacom: Correct distance scale for 2nd-gen Intuos devices
  HID: logitech-hidpp: remove support for the G700 over USB
  Revert "HID: logitech-hidpp: add USB PID for a few more supported mice"
  HID: wacom: add back changes dropped in merge commit
parents 5f97cbe2 fcf887e7

drivers/hid/hid-cp2112.c

+6 −2
Original line number Diff line number Diff line
@@ -1153,8 +1153,6 @@ static unsigned int cp2112_gpio_irq_startup(struct irq_data *d) 


	INIT_DELAYED_WORK(&dev->gpio_poll_worker, cp2112_gpio_poll_callback);



	cp2112_gpio_direction_input(gc, d->hwirq);



	if (!dev->gpio_poll) {

		dev->gpio_poll = true;

		schedule_delayed_work(&dev->gpio_poll_worker, 0);
@@ -1204,6 +1202,12 @@ static int __maybe_unused cp2112_allocate_irq(struct cp2112_device *dev, 
		return PTR_ERR(dev->desc[pin]);

	}



	ret = cp2112_gpio_direction_input(&dev->gc, pin);

	if (ret < 0) {

		dev_err(dev->gc.parent, "Failed to set GPIO to input dir\n");

		goto err_desc;

	}



	ret = gpiochip_lock_as_irq(&dev->gc, pin);

	if (ret) {

		dev_err(dev->gc.parent, "Failed to lock GPIO as interrupt\n");

drivers/hid/hid-logitech-hidpp.c

+0 −22
Original line number Diff line number Diff line
@@ -3749,30 +3749,8 @@ static const struct hid_device_id hidpp_devices[] = { 


	{ L27MHZ_DEVICE(HID_ANY_ID) },



	{ /* Logitech G203/Prodigy Gaming Mouse */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC084) },

	{ /* Logitech G302 Gaming Mouse */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07F) },

	{ /* Logitech G303 Gaming Mouse */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC080) },

	{ /* Logitech G400 Gaming Mouse */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07E) },

	{ /* Logitech G403 Wireless Gaming Mouse over USB */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC082) },

	{ /* Logitech G403 Gaming Mouse */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC083) },

	{ /* Logitech G403 Hero Gaming Mouse over USB */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC08F) },

	{ /* Logitech G502 Proteus Core Gaming Mouse */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07D) },

	{ /* Logitech G502 Proteus Spectrum Gaming Mouse over USB */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC332) },

	{ /* Logitech G502 Hero Gaming Mouse over USB */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC08B) },

	{ /* Logitech G700 Gaming Mouse over USB */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC06B) },

	{ /* Logitech G700s Gaming Mouse over USB */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC07C) },

	{ /* Logitech G703 Gaming Mouse over USB */

	  HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC087) },

	{ /* Logitech G703 Hero Gaming Mouse over USB */

drivers/hid/intel-ish-hid/ipc/hw-ish.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#define ICL_MOBILE_DEVICE_ID	0x34FC

#define SPT_H_DEVICE_ID		0xA135

#define CML_LP_DEVICE_ID	0x02FC

#define EHL_Ax_DEVICE_ID	0x4BB3



#define	REVISION_ID_CHT_A0	0x6

#define	REVISION_ID_CHT_Ax_SI	0x0

drivers/hid/intel-ish-hid/ipc/pci-ish.c

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ static const struct pci_device_id ish_pci_tbl[] = { 
	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, ICL_MOBILE_DEVICE_ID)},

	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, SPT_H_DEVICE_ID)},

	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CML_LP_DEVICE_ID)},

	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, EHL_Ax_DEVICE_ID)},

	{0, }

};

MODULE_DEVICE_TABLE(pci, ish_pci_tbl);

drivers/hid/wacom_wac.c

+5 −2
Original line number Diff line number Diff line
@@ -846,6 +846,8 @@ static int wacom_intuos_general(struct wacom_wac *wacom) 
		y >>= 1;

		distance >>= 1;

	}

	if (features->type == INTUOSHT2)

		distance = features->distance_max - distance;

	input_report_abs(input, ABS_X, x);

	input_report_abs(input, ABS_Y, y);

	input_report_abs(input, ABS_DISTANCE, distance);
@@ -1059,7 +1061,7 @@ static int wacom_remote_irq(struct wacom_wac *wacom_wac, size_t len) 
	input_report_key(input, BTN_BASE2, (data[11] & 0x02));



	if (data[12] & 0x80)

		input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f));

		input_report_abs(input, ABS_WHEEL, (data[12] & 0x7f) - 1);

	else

		input_report_abs(input, ABS_WHEEL, 0);
@@ -1290,7 +1292,8 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom) 
		}

		if (wacom->tool[0]) {

			input_report_abs(pen_input, ABS_PRESSURE, get_unaligned_le16(&frame[5]));

			if (wacom->features.type == INTUOSP2_BT) {

			if (wacom->features.type == INTUOSP2_BT ||

			    wacom->features.type == INTUOSP2S_BT) {

				input_report_abs(pen_input, ABS_DISTANCE,

						 range ? frame[13] : wacom->features.distance_max);

			} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE