Commit e7e3a53b 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:
 "The changes are all device/driver specific fixes:

   - EV_KEY and EV_ABS regression fix for Wacom from Ping Cheng

   - BIOS-specific quirk to fix some of the AMD_SFH-based systems, from
     Hans de Goede

   - other small error handling fixes and device ID additions"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: wacom: set EV_KEY and EV_ABS only for non-HID_GENERIC type of devices
  AMD_SFH: Add DMI quirk table for BIOS-es which don't set the activestatus bits
  AMD_SFH: Add sensor_mask module parameter
  AMD_SFH: Removed unused activecontrolstatus member from the amd_mp2_dev struct
  HID: wacom: Assign boolean values to a bool variable
  HID cp2112: fix support for multiple gpiochips
  HID: alps: fix error return code in alps_input_configured()
  HID: asus: Add support for 2021 ASUS N-Key keyboard
  HID: google: add don USB id
parents 1df01322 276559d8

drivers/hid/amd-sfh-hid/amd_sfh_pcie.c

+37 −3
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/bitops.h>

#include <linux/delay.h>

#include <linux/dma-mapping.h>

#include <linux/dmi.h>

#include <linux/interrupt.h>

#include <linux/io-64-nonatomic-lo-hi.h>

#include <linux/module.h>
@@ -25,6 +26,10 @@ 
#define MAGNO_EN	BIT(2)

#define ALS_EN		BIT(19)



static int sensor_mask_override = -1;

module_param_named(sensor_mask, sensor_mask_override, int, 0444);

MODULE_PARM_DESC(sensor_mask, "override the detected sensors mask");



void amd_start_sensor(struct amd_mp2_dev *privdata, struct amd_mp2_sensor_info info)

{

	union sfh_cmd_param cmd_param;
@@ -73,12 +78,41 @@ void amd_stop_all_sensors(struct amd_mp2_dev *privdata) 
	writel(cmd_base.ul, privdata->mmio + AMD_C2P_MSG0);

}



static const struct dmi_system_id dmi_sensor_mask_overrides[] = {

	{

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY x360 Convertible 13-ag0xxx"),

		},

		.driver_data = (void *)(ACEL_EN | MAGNO_EN),

	},

	{

		.matches = {

			DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY x360 Convertible 15-cp0xxx"),

		},

		.driver_data = (void *)(ACEL_EN | MAGNO_EN),

	},

	{ }

};



int amd_mp2_get_sensor_num(struct amd_mp2_dev *privdata, u8 *sensor_id)

{

	int activestatus, num_of_sensors = 0;

	const struct dmi_system_id *dmi_id;

	u32 activecontrolstatus;



	if (sensor_mask_override == -1) {

		dmi_id = dmi_first_match(dmi_sensor_mask_overrides);

		if (dmi_id)

			sensor_mask_override = (long)dmi_id->driver_data;

	}



	if (sensor_mask_override >= 0) {

		activestatus = sensor_mask_override;

	} else {

		activecontrolstatus = readl(privdata->mmio + AMD_P2C_MSG3);

		activestatus = activecontrolstatus >> 4;

	}



	privdata->activecontrolstatus = readl(privdata->mmio + AMD_P2C_MSG3);

	activestatus = privdata->activecontrolstatus >> 4;

	if (ACEL_EN  & activestatus)

		sensor_id[num_of_sensors++] = accel_idx;

drivers/hid/amd-sfh-hid/amd_sfh_pcie.h

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ struct amd_mp2_dev { 
	struct pci_dev *pdev;

	struct amdtp_cl_data *cl_data;

	void __iomem *mmio;

	u32 activecontrolstatus;

};



struct amd_mp2_sensor_info {

drivers/hid/hid-alps.c

+1 −0
Original line number Diff line number Diff line
@@ -761,6 +761,7 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) 


		if (input_register_device(data->input2)) {

			input_free_device(input2);

			ret = -ENOENT;

			goto exit;

		}

	}

drivers/hid/hid-asus.c

+3 −0
Original line number Diff line number Diff line
@@ -1221,6 +1221,9 @@ static const struct hid_device_id asus_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD),

	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2),

	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD),

	  QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },

drivers/hid/hid-cp2112.c

+11 −11
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ struct cp2112_device { 
	atomic_t read_avail;

	atomic_t xfer_avail;

	struct gpio_chip gc;

	struct irq_chip irq;

	u8 *in_out_buffer;

	struct mutex lock;
@@ -1175,16 +1176,6 @@ static int cp2112_gpio_irq_type(struct irq_data *d, unsigned int type) 
	return 0;

}



static struct irq_chip cp2112_gpio_irqchip = {

	.name = "cp2112-gpio",

	.irq_startup = cp2112_gpio_irq_startup,

	.irq_shutdown = cp2112_gpio_irq_shutdown,

	.irq_ack = cp2112_gpio_irq_ack,

	.irq_mask = cp2112_gpio_irq_mask,

	.irq_unmask = cp2112_gpio_irq_unmask,

	.irq_set_type = cp2112_gpio_irq_type,

};



static int __maybe_unused cp2112_allocate_irq(struct cp2112_device *dev,

					      int pin)

{
@@ -1339,8 +1330,17 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	dev->gc.can_sleep		= 1;

	dev->gc.parent			= &hdev->dev;



	dev->irq.name = "cp2112-gpio";

	dev->irq.irq_startup = cp2112_gpio_irq_startup;

	dev->irq.irq_shutdown = cp2112_gpio_irq_shutdown;

	dev->irq.irq_ack = cp2112_gpio_irq_ack;

	dev->irq.irq_mask = cp2112_gpio_irq_mask;

	dev->irq.irq_unmask = cp2112_gpio_irq_unmask;

	dev->irq.irq_set_type = cp2112_gpio_irq_type;

	dev->irq.flags = IRQCHIP_MASK_ON_SUSPEND;



	girq = &dev->gc.irq;

	girq->chip = &cp2112_gpio_irqchip;

	girq->chip = &dev->irq;

	/* The event comes from the outside so no parent handler */

	girq->parent_handler = NULL;

	girq->num_parents = 0;