Merge branch 'for-7.3/msi' into for-linus

- support for MSI Claw (Derek J. Clark)
This commit is contained in:
Jiri Kosina 2026-08-19 09:21:17 +02:00
commit 310b6aff4f
5 changed files with 2088 additions and 0 deletions

View File

@ -18345,6 +18345,12 @@ S: Odd Fixes
F: Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
F: drivers/net/ieee802154/mrf24j40.c
MSI HID DRIVER
M: Derek J. Clark <derekjohn.clark@gmail.com>
L: linux-input@vger.kernel.org
S: Maintained
F: drivers/hid/hid-msi.c
MSI EC DRIVER
M: Nikita Kravets <teackot@gmail.com>
L: platform-driver-x86@vger.kernel.org

View File

@ -485,6 +485,19 @@ config HID_GT683R
Currently the following devices are know to be supported:
- MSI GT683R
config HID_MSI
tristate "MSI Claw Gamepad Support"
depends on USB_HID
select NEW_LEDS
select LEDS_CLASS
select LEDS_CLASS_MULTICOLOR
help
Support for the MSI Claw RGB and controller configuration
Say Y here to include configuration interface support for the MSI Claw Line
of Handheld Console Controllers. Say M here to compile this driver as a
module. The module will be called hid-msi.
config HID_KEYTOUCH
tristate "Keytouch HID devices"
help

View File

@ -92,6 +92,7 @@ obj-$(CONFIG_HID_MAYFLASH) += hid-mf.o
obj-$(CONFIG_HID_MEGAWORLD_FF) += hid-megaworld.o
obj-$(CONFIG_HID_MICROSOFT) += hid-microsoft.o
obj-$(CONFIG_HID_MONTEREY) += hid-monterey.o
obj-$(CONFIG_HID_MSI) += hid-msi.o
obj-$(CONFIG_HID_MULTITOUCH) += hid-multitouch.o
obj-$(CONFIG_HID_NINTENDO) += hid-nintendo.o
obj-$(CONFIG_HID_NTI) += hid-nti.o

View File

@ -1077,7 +1077,12 @@
#define USB_DEVICE_ID_MOZA_R16_R21_2 0x0010
#define USB_VENDOR_ID_MSI 0x1770
#define USB_VENDOR_ID_MSI_2 0x0db0
#define USB_DEVICE_ID_MSI_GT683R_LED_PANEL 0xff00
#define USB_DEVICE_ID_MSI_CLAW_XINPUT 0x1901
#define USB_DEVICE_ID_MSI_CLAW_DINPUT 0x1902
#define USB_DEVICE_ID_MSI_CLAW_DESKTOP 0x1903
#define USB_DEVICE_ID_MSI_CLAW_BIOS 0x1904
#define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400
#define USB_DEVICE_ID_N_S_HARMONY 0xc359

2063
drivers/hid/hid-msi.c Normal file

File diff suppressed because it is too large Load Diff