Commit a820e450 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-5.5/logitech' into for-linus 

- Support for Logitech G15 (Hans de Goede)
- silencing of non-informative error flow in dmesg from
  logitechi-hiddpp (Hans de Goede)
parents 2fa55328 61005d65

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -9599,6 +9599,13 @@ S: Maintained 
F:	Documentation/admin-guide/ldm.rst

F:	block/partitions/ldm.*













LOGITECH HID GAMING KEYBOARDS













M:	Hans de Goede <hdegoede@redhat.com>













L:	linux-input@vger.kernel.org













T:	git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git













S:	Maintained













F:	drivers/hid/hid-lg-g15.c



























LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)















M:	Sathya Prakash <sathya.prakash@broadcom.com>















M:	Chaitra P B <chaitra.basappa@broadcom.com>

































drivers/hid/Kconfig



+1
−0






























Original line number
Diff line number
Diff line








@@ -525,6 +525,7 @@ config HID_LENOVO













config HID_LOGITECH















	tristate "Logitech devices"















	depends on HID













	depends on LEDS_CLASS















	default !EXPERT















	---help---















	Support for Logitech devices that are not fully compliant with HID standard.

































drivers/hid/Makefile



+1
−0






























Original line number
Diff line number
Diff line








@@ -64,6 +64,7 @@ obj-$(CONFIG_HID_KYE)		+= hid-kye.o













obj-$(CONFIG_HID_LCPOWER)	+= hid-lcpower.o















obj-$(CONFIG_HID_LENOVO)	+= hid-lenovo.o















obj-$(CONFIG_HID_LOGITECH)	+= hid-logitech.o













obj-$(CONFIG_HID_LOGITECH)	+= hid-lg-g15.o















obj-$(CONFIG_HID_LOGITECH_DJ)	+= hid-logitech-dj.o















obj-$(CONFIG_HID_LOGITECH_HIDPP)	+= hid-logitech-hidpp.o















obj-$(CONFIG_HID_MACALLY)	+= hid-macally.o

































drivers/hid/hid-ids.h



+4
−0






























Original line number
Diff line number
Diff line








@@ -750,6 +750,10 @@













#define USB_DEVICE_ID_LOGITECH_DUAL_ACTION	0xc216















#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2	0xc218















#define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2	0xc219













#define USB_DEVICE_ID_LOGITECH_G15_LCD		0xc222













#define USB_DEVICE_ID_LOGITECH_G15_V2_LCD	0xc227













#define USB_DEVICE_ID_LOGITECH_G510		0xc22d













#define USB_DEVICE_ID_LOGITECH_G510_USB_AUDIO	0xc22e















#define USB_DEVICE_ID_LOGITECH_G29_WHEEL	0xc24f















#define USB_DEVICE_ID_LOGITECH_G920_WHEEL	0xc262















#define USB_DEVICE_ID_LOGITECH_WINGMAN_F3D	0xc283









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE