Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid (c101e9bb) · Commits · 戴 / test

MAINTAINERS

+7 −0

Original line number	Diff line number	Diff line
		@@ -10295,6 +10295,13 @@ F: drivers/net/can/m_can/m_can.c
		F: drivers/net/can/m_can/m_can.h
		F: drivers/net/can/m_can/m_can_platform.c

		MCP2221A MICROCHIP USB-HID TO I2C BRIDGE DRIVER
		M: Rishi Gupta <gupt21@gmail.com>
		L: linux-i2c@vger.kernel.org
		L: linux-input@vger.kernel.org
		S: Maintained
		F: drivers/hid/hid-mcp2221.c

		MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
		M: Peter Rosin <peda@axentia.se>
		L: linux-iio@vger.kernel.org

drivers/hid/Kconfig

+17 −0

Original line number	Diff line number	Diff line
		@@ -362,6 +362,13 @@ config HID_GFRM
		---help---
		Support for Google Fiber TV Box remote controls

		config HID_GLORIOUS
		tristate "Glorious PC Gaming Race mice"
		depends on HID
		help
		Support for Glorious PC Gaming Race mice such as
		the Glorious Model O, O- and D.

		config HID_HOLTEK
		tristate "Holtek HID devices"
		depends on USB_HID
		@@ -1145,6 +1152,16 @@ config HID_ALPS
		Say Y here if you have a Alps touchpads over i2c-hid or usbhid
		and want support for its special functionalities.

		config HID_MCP2221
		tristate "Microchip MCP2221 HID USB-to-I2C/SMbus host support"
		depends on USB_HID && I2C
		---help---
		Provides I2C and SMBUS host adapter functionality over USB-HID
		through MCP2221 device.

		To compile this driver as a module, choose M here: the module
		will be called hid-mcp2221.ko.

		endmenu

		endif # HID

drivers/hid/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ obj-$(CONFIG_HID_ELO) += hid-elo.o
		obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o
		obj-$(CONFIG_HID_GEMBIRD) += hid-gembird.o
		obj-$(CONFIG_HID_GFRM) += hid-gfrm.o
		obj-$(CONFIG_HID_GLORIOUS) += hid-glorious.o
		obj-$(CONFIG_HID_GOOGLE_HAMMER) += hid-google-hammer.o
		obj-$(CONFIG_HID_GT683R) += hid-gt683r.o
		obj-$(CONFIG_HID_GYRATION) += hid-gyration.o
		@@ -70,6 +71,7 @@ obj-$(CONFIG_HID_LOGITECH_HIDPP) += hid-logitech-hidpp.o
		obj-$(CONFIG_HID_MACALLY) += hid-macally.o
		obj-$(CONFIG_HID_MAGICMOUSE) += hid-magicmouse.o
		obj-$(CONFIG_HID_MALTRON) += hid-maltron.o
		obj-$(CONFIG_HID_MCP2221) += hid-mcp2221.o
		obj-$(CONFIG_HID_MAYFLASH) += hid-mf.o
		obj-$(CONFIG_HID_MICROSOFT) += hid-microsoft.o
		obj-$(CONFIG_HID_MONTEREY) += hid-monterey.o

drivers/hid/hid-appleir.c

+4 −8

Original line number	Diff line number	Diff line
		@@ -283,11 +283,9 @@ static int appleir_probe(struct hid_device hid, const struct hid_device_id id)
		int ret;
		struct appleir *appleir;

		appleir = kzalloc(sizeof(struct appleir), GFP_KERNEL);
		if (!appleir) {
		ret = -ENOMEM;
		goto allocfail;
		}
		appleir = devm_kzalloc(&hid->dev, sizeof(struct appleir), GFP_KERNEL);
		if (!appleir)
		return -ENOMEM;

		appleir->hid = hid;

		@@ -313,8 +311,7 @@ static int appleir_probe(struct hid_device hid, const struct hid_device_id id)

		return 0;
		fail:
		kfree(appleir);
		allocfail:
		devm_kfree(&hid->dev, appleir);
		return ret;
		}

		@@ -323,7 +320,6 @@ static void appleir_remove(struct hid_device *hid)
		struct appleir *appleir = hid_get_drvdata(hid);
		hid_hw_stop(hid);
		del_timer_sync(&appleir->key_up_timer);
		kfree(appleir);
		}

		static const struct hid_device_id appleir_devices[] = {

drivers/hid/hid-glorious.c

0 → 100644

+86 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-or-later
		/*
		* USB HID driver for Glorious PC Gaming Race
		* Glorious Model O, O- and D mice.
		*
		* Copyright (c) 2020 Samuel Čavoj <sammko@sammserver.com>
		*/

		/*
		*/

		#include <linux/hid.h>
		#include <linux/module.h>

		#include "hid-ids.h"

		MODULE_AUTHOR("Samuel Čavoj <sammko@sammserver.com>");
		MODULE_DESCRIPTION("HID driver for Glorious PC Gaming Race mice");

		/*
		* Glorious Model O and O- specify the const flag in the consumer input
		* report descriptor, which leads to inputs being ignored. Fix this
		* by patching the descriptor.
		*/
		static __u8 glorious_report_fixup(struct hid_device hdev, __u8 *rdesc,
		unsigned int *rsize)
		{
		if (*rsize == 213 &&
		rdesc[84] == 129 && rdesc[112] == 129 && rdesc[140] == 129 &&
		rdesc[85] == 3 && rdesc[113] == 3 && rdesc[141] == 3) {
		hid_info(hdev, "patching Glorious Model O consumer control report descriptor\n");
		rdesc[85] = rdesc[113] = rdesc[141] = \
		HID_MAIN_ITEM_VARIABLE \| HID_MAIN_ITEM_RELATIVE;
		}
		return rdesc;
		}

		static void glorious_update_name(struct hid_device *hdev)
		{
		const char *model = "Device";

		switch (hdev->product) {
		case USB_DEVICE_ID_GLORIOUS_MODEL_O:
		model = "Model O"; break;
		case USB_DEVICE_ID_GLORIOUS_MODEL_D:
		model = "Model D"; break;
		}

		snprintf(hdev->name, sizeof(hdev->name), "%s %s", "Glorious", model);
		}

		static int glorious_probe(struct hid_device *hdev,
		const struct hid_device_id *id)
		{
		int ret;

		hdev->quirks \|= HID_QUIRK_INPUT_PER_APP;

		ret = hid_parse(hdev);
		if (ret)
		return ret;

		glorious_update_name(hdev);

		return hid_hw_start(hdev, HID_CONNECT_DEFAULT);
		}

		static const struct hid_device_id glorious_devices[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_GLORIOUS,
		USB_DEVICE_ID_GLORIOUS_MODEL_O) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_GLORIOUS,
		USB_DEVICE_ID_GLORIOUS_MODEL_D) },
		{ }
		};
		MODULE_DEVICE_TABLE(hid, glorious_devices);

		static struct hid_driver glorious_driver = {
		.name = "glorious",
		.id_table = glorious_devices,
		.probe = glorious_probe,
		.report_fixup = glorious_report_fixup
		};

		module_hid_driver(glorious_driver);

		MODULE_LICENSE("GPL");

Admin message