Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c2f421c authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-4.8/hid-led' into for-linus 

Conflicts:
	drivers/hid/hid-thingm.c
parents e82a82c1 f4c109b6

MAINTAINERS

+0 −5
Original line number Diff line number Diff line
@@ -11314,11 +11314,6 @@ F: Documentation/thermal/cpu-cooling-api.txt 
F:	drivers/thermal/cpu_cooling.c

F:	include/linux/cpu_cooling.h



THINGM BLINK(1) USB RGB LED DRIVER

M:	Vivien Didelot <vivien.didelot@savoirfairelinux.com>

S:	Maintained

F:	drivers/hid/hid-thingm.c



THINKPAD ACPI EXTRAS DRIVER

M:	Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>

L:	ibm-acpi-devel@lists.sourceforge.net

drivers/hid/Kconfig

+19 −4
Original line number Diff line number Diff line
@@ -388,6 +388,21 @@ config HID_LCPOWER 
	---help---

	Support for LC-Power RC1000MCE RF remote control.



config HID_LED

	tristate "Simple RGB LED support"

	depends on HID

	depends on LEDS_CLASS

	---help---

	Support for simple RGB LED devices. Currently supported are:

	- Riso Kagaku Webmail Notifier

	- Dream Cheeky Webmail Notifier and Friends Alert

	- ThingM blink(1)

	- Delcom Visual Signal Indicator Generation 2

	- Greynut Luxafor



	To compile this driver as a module, choose M here: the

	module will be called hid-led.



config HID_LENOVO

	tristate "Lenovo / Thinkpad devices"

	depends on HID
@@ -819,11 +834,11 @@ config HID_THINGM 
	tristate "ThingM blink(1) USB RGB LED"

	depends on HID

	depends on LEDS_CLASS

	select HID_LED

	---help---

	Support for the ThingM blink(1) USB RGB LED. This driver registers a

	Linux LED class instance, plus additional sysfs attributes to control

	RGB colors, fade time and playing. The device is exposed through hidraw

	to access other functions.

	Support for the ThingM blink(1) USB RGB LED. This driver has been

	merged into the generic hid led driver. Config symbol HID_THINGM

	just selects HID_LED and will be removed soon.



config HID_THRUSTMASTER

	tristate "ThrustMaster devices support"

drivers/hid/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -91,12 +91,12 @@ obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o 
obj-$(CONFIG_HID_STEELSERIES)	+= hid-steelseries.o

obj-$(CONFIG_HID_SUNPLUS)	+= hid-sunplus.o

obj-$(CONFIG_HID_GREENASIA)	+= hid-gaff.o

obj-$(CONFIG_HID_THINGM)	+= hid-thingm.o

obj-$(CONFIG_HID_THRUSTMASTER)	+= hid-tmff.o

obj-$(CONFIG_HID_TIVO)		+= hid-tivo.o

obj-$(CONFIG_HID_TOPSEED)	+= hid-topseed.o

obj-$(CONFIG_HID_TWINHAN)	+= hid-twinhan.o

obj-$(CONFIG_HID_UCLOGIC)	+= hid-uclogic.o

obj-$(CONFIG_HID_LED)		+= hid-led.o

obj-$(CONFIG_HID_XINMO)		+= hid-xinmo.o

obj-$(CONFIG_HID_ZEROPLUS)	+= hid-zpff.o

obj-$(CONFIG_HID_ZYDACRON)	+= hid-zydacron.o

drivers/hid/hid-core.c

+5 −3
Original line number Diff line number Diff line
@@ -1879,8 +1879,11 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_4) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELCOM, USB_DEVICE_ID_DELCOM_VISUAL_IND) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_WN) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_FA) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELO, 0x0009) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELO, 0x0030) },
@@ -1964,6 +1967,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACENAVIGATOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD_BOOTLOADER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_LUXAFOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },
@@ -2010,6 +2014,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, HID_ANY_ID) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_RISO_KAGAKU, USB_DEVICE_ID_RI_KA_WEBMAIL) },

#if IS_ENABLED(CONFIG_HID_ROCCAT)

	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ARVO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_ISKU) },
@@ -2350,8 +2355,6 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_DEALEXTREAME, USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x0004) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, 0x000a) },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, 0x0400) },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, 0x0401) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },
@@ -2488,7 +2491,6 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) },

#endif

	{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_RISO_KAGAKU, USB_DEVICE_ID_RI_KA_WEBMAIL) },

	{ }

};

drivers/hid/hid-ids.h

+6 −0
Original line number Diff line number Diff line
@@ -300,6 +300,9 @@ 
#define USB_VENDOR_ID_DEALEXTREAME	0x10c5

#define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701	0x819a



#define USB_VENDOR_ID_DELCOM		0x0fc5

#define USB_DEVICE_ID_DELCOM_VISUAL_IND	0xb080



#define USB_VENDOR_ID_DELORME		0x1163

#define USB_DEVICE_ID_DELORME_EARTHMATE	0x0100

#define USB_DEVICE_ID_DELORME_EM_LT20	0x0200
@@ -338,6 +341,8 @@ 
#define USB_DEVICE_ID_ELECOM_BM084	0x0061



#define USB_VENDOR_ID_DREAM_CHEEKY	0x1d34

#define USB_DEVICE_ID_DREAM_CHEEKY_WN	0x0004

#define USB_DEVICE_ID_DREAM_CHEEKY_FA	0x000a



#define USB_VENDOR_ID_ELITEGROUP	0x03fc

#define USB_DEVICE_ID_ELITEGROUP_05D8	0x05d8
@@ -684,6 +689,7 @@ 
#define USB_DEVICE_ID_PICOLCD_BOOTLOADER	0xf002

#define USB_DEVICE_ID_PICK16F1454	0x0042

#define USB_DEVICE_ID_PICK16F1454_V2	0xf2f7

#define USB_DEVICE_ID_LUXAFOR		0xf372



#define USB_VENDOR_ID_MICROSOFT		0x045e

#define USB_DEVICE_ID_SIDEWINDER_GV	0x003b