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

Commit 48a732df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

Pull HID subsystem updates from Jiri Kosina:
 "HID subsystem and drivers update. Highlights:

   - new support of a group of Win7/Win8 multitouch devices, from
     Benjamin Tissoires

   - fix for compat interface brokenness in uhid, from Dmitry Torokhov

   - conversion of drivers to use hid_driver helper, by H Hartley
     Sweeten

   - HID over I2C transport received ACPI enumeration support, written
     by Mika Westerberg

   - there is an ongoing effort to make HID sensor hubs independent of
     USB transport.  The first self-contained part of this work is
     provided here, done by Mika Westerberg

   - a few smaller fixes here and there, support for a couple new
     devices added"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (43 commits)
  HID: Correct Logitech order in hid-ids.h
  HID: LG4FF: Remove unnecessary deadzone code
  HID: LG: Prevent the Logitech Gaming Wheels deadzone
  HID: LG: Fix detection of Logitech Speed Force Wireless (WiiWheel)
  HID: LG: Add support for Logitech Momo Force (Red) Wheel
  HID: hidraw: print message when succesfully initialized
  HID: logitech: split accel, brake for Driving Force wheel
  HID: logitech: add report descriptor for Driving Force wheel
  HID: add ThingM blink(1) USB RGB LED support
  HID: uhid: make creating devices work on 64/32 systems
  HID: wiimote: fix nunchuck button parser
  HID: blacklist Velleman data acquisition boards
  HID: sensor-hub: don't limit the driver only to USB bus
  HID: sensor-hub: get rid of unused sensor_hub_grabbed_usages[] table
  HID: extend autodetect to handle I2C sensors as well
  HID: ntrig: use input_configured() callback to set the name
  HID: multitouch: do not use pointers towards hid-core
  HID: add missing GENERIC_HARDIRQ dependency
  HID: multitouch: make MT_CLS_ALWAYS_TRUE the new default class
  HID: multitouch: fix protocol for Elo panels
  ...
parents 9afa3195 0d69a3c7

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

0 → 100644
+21 −0
Original line number Diff line number Diff line 
What:		/sys/class/leds/SRWS1::<serial>::RPM1

What:		/sys/class/leds/SRWS1::<serial>::RPM2

What:		/sys/class/leds/SRWS1::<serial>::RPM3

What:		/sys/class/leds/SRWS1::<serial>::RPM4

What:		/sys/class/leds/SRWS1::<serial>::RPM5

What:		/sys/class/leds/SRWS1::<serial>::RPM6

What:		/sys/class/leds/SRWS1::<serial>::RPM7

What:		/sys/class/leds/SRWS1::<serial>::RPM8

What:		/sys/class/leds/SRWS1::<serial>::RPM9

What:		/sys/class/leds/SRWS1::<serial>::RPM10

What:		/sys/class/leds/SRWS1::<serial>::RPM11

What:		/sys/class/leds/SRWS1::<serial>::RPM12

What:		/sys/class/leds/SRWS1::<serial>::RPM13

What:		/sys/class/leds/SRWS1::<serial>::RPM14

What:		/sys/class/leds/SRWS1::<serial>::RPM15

What:		/sys/class/leds/SRWS1::<serial>::RPMALL

Date:		Jan 2013

KernelVersion:	3.9

Contact:	Simon Wood <simon@mungewell.org>

Description:	Provides a control for turning on/off the LEDs which form

		an RPM meter on the front of the controller

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

+17 −1
Original line number Diff line number Diff line
@@ -596,6 +596,12 @@ config HID_SPEEDLINK 
	---help---

	Support for Speedlink Vicious and Divine Cezanne mouse.



config HID_STEELSERIES

	tristate "Steelseries SRW-S1 steering wheel support"

	depends on USB_HID

	---help---

	Support for Steelseries SRW-S1 steering wheel



config HID_SUNPLUS

	tristate "Sunplus wireless desktop"

	depends on USB_HID
@@ -655,6 +661,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 +735,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

+2 −0
Original line number Diff line number Diff line
@@ -101,8 +101,10 @@ obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o 
obj-$(CONFIG_HID_SMARTJOYPLUS)	+= hid-sjoy.o

obj-$(CONFIG_HID_SONY)		+= hid-sony.o

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