Commit 2ec37df7 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.14/intel-thc' into for-linus 

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

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
@@ -11873,6 +11873,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



+2
−0






























Original line number
Diff line number
Diff line







@@ -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/