Commit 27c02784 authored Jan 22, 2025 by Linus Torvalds

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

Pull HID updates from Jiri Kosina:

 - newly added support for Intel Touch Host Controller (Even Xu, Xinpeng
   Sun)

 - hid-core fix for long-standing syzbot-reported cornercase of
   Resolution Multiplier not being present in any of the Logical
   Collections in the device HID report descriptor (Alan Stern)

 - improvement of behavior for non-standard LED brightness values for
   Wacom driver (Jason Gerecke)

 - PCI Wacom device support (depends on Intel THC support) (Even Xu)

 - SteelSeries Arctis 9 support (Christian Mayer)

 - constification of 'struct bin_attribute' in various HID driver
   (Thomas Weißschuh)

 - other assorted code cleanups / fixes and device ID additions

* tag 'hid-for-linus-2025012001' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: (63 commits)
  HID: hid-asus: Disable OOBE mode on the ProArt P16
  HID: steelseries: remove unnecessary return
  HID: steelseries: export model and manufacturer
  HID: steelseries: export charging state for the SteelSeries Arctis 9 headset
  HID: steelseries: add SteelSeries Arctis 9 support
  HID: steelseries: preparation for adding SteelSeries Arctis 9 support
  HID: intel-thc-hid: fix build errors in um mode
  HID: intel-thc-hid: intel-quicki2c: fix potential memory corruption
  HID: intel-thc-hid: intel-thc: Fix error code in thc_i2c_subip_init()
  HID: lenovo: Fix undefined platform_profile_cycle in ThinkPad X12 keyboard patch
  HID: uclogic: make const read-only array touch_ring_model_params_buf static
  HID: hid-steam: Make sure rumble work is canceled on removal
  HID: Wacom: Add PCI Wacom device support
  HID: intel-thc-hid: intel-quicki2c: Add PM implementation
  HID: intel-thc-hid: intel-quicki2c: Complete THC QuickI2C driver
  HID: intel-thc-hid: intel-quicki2c: Add HIDI2C protocol implementation
  HID: intel-thc-hid: intel-quicki2c: Add THC QuickI2C ACPI interfaces
  HID: intel-thc-hid: intel-quicki2c: Add THC QuickI2C driver hid layer
  HID: intel-thc-hid: intel-quicki2c: Add THC QuickI2C driver skeleton
  HID: intel-thc-hid: intel-quickspi: Add PM implementation
  ...

parents d78794d4 973d6904

Documentation/hid/index.rst

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,4 +18,5 @@ Human Interface Devices (HID)

		hid-alps
		intel-ish-hid
		intel-thc-hid
		amd-sfh-hid

Documentation/hid/intel-thc-hid.rst

0 → 100644

+568 −0

File added.

Preview size limit exceeded, changes collapsed.

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -11918,6 +11918,12 @@ S: Maintained
		F: arch/x86/include/asm/intel_telemetry.h
		F: drivers/platform/x86/intel/telemetry/

		INTEL TOUCH HOST CONTROLLER (THC) DRIVER
		M: Even Xu <even.xu@intel.com>
		M: Xinpeng Sun <xinpeng.sun@intel.com>
		S: Maintained
		F: drivers/hid/intel-thc-hid/

		INTEL TPMI DRIVER
		M: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
		L: platform-driver-x86@vger.kernel.org

drivers/hid/Kconfig

+3 −1

Original line number	Diff line number	Diff line
		@@ -787,7 +787,7 @@ config HID_NINTENDO
		Adds support for the Nintendo Switch Joy-Cons, NSO, Pro Controller.
		All controllers support bluetooth, and the Pro Controller also supports
		its USB mode. This also includes support for the Nintendo Switch Online
		Controllers which include the Genesis, SNES, and N64 controllers.
		Controllers which include the NES, Genesis, SNES, and N64 controllers.

		To compile this driver as a module, choose M here: the
		module will be called hid-nintendo.
		@@ -1386,4 +1386,6 @@ source "drivers/hid/amd-sfh-hid/Kconfig"

		source "drivers/hid/surface-hid/Kconfig"

		source "drivers/hid/intel-thc-hid/Kconfig"

		endif # HID_SUPPORT

drivers/hid/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -171,3 +171,5 @@ obj-$(INTEL_ISH_FIRMWARE_DOWNLOADER) += intel-ish-hid/
		obj-$(CONFIG_AMD_SFH_HID) += amd-sfh-hid/

		obj-$(CONFIG_SURFACE_HID_CORE) += surface-hid/

		obj-$(CONFIG_INTEL_THC_HID) += intel-thc-hid/