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

Merge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig',... 

Merge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig', 'for-3.9/thingm' and 'for-3.9/upstream' into for-linus
parents 539cf54b 483f86a5 7e3cc447 1b474fe8 30ba2fbd

Documentation/ABI/testing/sysfs-driver-hid-thingm

0 → 100644
+23 −0
Original line number Diff line number Diff line 
What:		/sys/class/leds/blink1::<serial>/rgb

Date:		January 2013

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

Description:	The ThingM blink1 is an USB RGB LED. The color notation is

		3-byte hexadecimal. Read this attribute to get the last set

		color. Write the 24-bit hexadecimal color to change the current

		LED color. The default color is full white (0xFFFFFF).

		For instance, set the color to green with: echo 00FF00 > rgb



What:		/sys/class/leds/blink1::<serial>/fade

Date:		January 2013

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

Description:	This attribute allows to set a fade time in milliseconds for

		the next color change. Read the attribute to know the current

		fade time. The default value is set to 0 (no fade time). For

		instance, set a fade time of 2 seconds with: echo 2000 > fade



What:		/sys/class/leds/blink1::<serial>/play

Date:		January 2013

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

Description:	This attribute is used to play/pause the light patterns. Write 1

		to start playing, 0 to stop. Reading this attribute returns the

		current playing status.

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -7585,6 +7585,11 @@ S: Supported 
F:      drivers/thermal/

F:      include/linux/thermal.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

+11 −1
Original line number Diff line number Diff line
@@ -655,6 +655,16 @@ config HID_TOPSEED 
	Say Y if you have a TopSeed Cyberlink or BTC Emprex or Conceptronic

	CLLRCMCE remote control.



config HID_THINGM

	tristate "ThingM blink(1) USB RGB LED"

	depends on USB_HID

	depends on LEDS_CLASS

	---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.



config HID_THRUSTMASTER

	tristate "ThrustMaster devices support"

	depends on USB_HID
@@ -719,7 +729,7 @@ config HID_ZYDACRON 


config HID_SENSOR_HUB

	tristate "HID Sensors framework support"

	depends on USB_HID

	depends on USB_HID && GENERIC_HARDIRQS

	select MFD_CORE

	default n

	-- help---

drivers/hid/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ obj-$(CONFIG_HID_SONY) += hid-sony.o 
obj-$(CONFIG_HID_SPEEDLINK)	+= hid-speedlink.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

drivers/hid/hid-a4tech.c

+1 −12
Original line number Diff line number Diff line
@@ -146,17 +146,6 @@ static struct hid_driver a4_driver = { 
	.probe = a4_probe,

	.remove = a4_remove,

};

module_hid_driver(a4_driver);



static int __init a4_init(void)

{

	return hid_register_driver(&a4_driver);

}



static void __exit a4_exit(void)

{

	hid_unregister_driver(&a4_driver);

}



module_init(a4_init);

module_exit(a4_exit);

MODULE_LICENSE("GPL");