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

Commit 14738e03 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull input subsystem updates from Dmitry Torokhov:
 "Thanks to Samuel Thibault input device (keyboard) LEDs are no longer
  hardwired within the input core but use LED subsystem and so allow use
  of different triggers; Hans de Goede did a large update for the ALPS
  touchpad driver; we have new TI drv2665 haptics driver and DA9063
  OnKey driver, and host of other drivers got various fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (55 commits)
  Input: pixcir_i2c_ts - fix receive error
  MAINTAINERS: remove non existent input mt git tree
  Input: improve usage of gpiod API
  tty/vt/keyboard: define LED triggers for VT keyboard lock states
  tty/vt/keyboard: define LED triggers for VT LED states
  Input: export LEDs as class devices in sysfs
  Input: cyttsp4 - use swap() in cyttsp4_get_touch()
  Input: goodix - do not explicitly set evbits in input device
  Input: goodix - export id and version read from device
  Input: goodix - fix variable length array warning
  Input: goodix - fix alignment issues
  Input: add OnKey driver for DA9063 MFD part
  Input: elan_i2c - add product IDs FW names
  Input: elan_i2c - add support for multi IC type and iap format
  Input: focaltech - report finger width to userspace
  tty: remove platform_sysrq_reset_seq
  Input: synaptics_i2c - use proper boolean values
  Input: psmouse - use true instead of 1 for boolean values
  Input: cyapa - fix a few typos in comments
  Input: stmpe-ts - enforce device tree only mode
  ...
parents 45471cd9 f7ebc4dc

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ adi,adt7475 +/-1C TDM Extended Temp Range I.C 
adi,adt7476		+/-1C TDM Extended Temp Range I.C

adi,adt7490		+/-1C TDM Extended Temp Range I.C

adi,adxl345		Three-Axis Digital Accelerometer

adi,adxl346		Three-Axis Digital Accelerometer

adi,adxl34x		Three-Axis Digital Accelerometer

adi,adxl346		Three-Axis Digital Accelerometer (backward-compatibility value "adi,adxl345" must be listed too)

at,24c08		i2c serial eeprom  (24cxx)

atmel,24c00		i2c serial eeprom  (24cxx)

atmel,24c01		i2c serial eeprom  (24cxx)

Documentation/devicetree/bindings/input/ti,drv2665.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
* Texas Instruments - drv2665 Haptics driver



Required properties:

	- compatible - "ti,drv2665" - DRV2665

	- reg -  I2C slave address

	- vbat-supply - Required supply regulator



Example:



haptics: haptics@59 {

	compatible = "ti,drv2665";

	reg = <0x59>;

	vbat-supply = <&vbat>;

};



For more product information please see the link below:

http://www.ti.com/product/drv2665

Documentation/leds/leds-class.txt

+0 −3
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 
LED handling under Linux

========================



If you're reading this and thinking about keyboard leds, these are

handled by the input subsystem and the led class is *not* needed.



In its simplest form, the LED class just allows control of LEDs from

userspace. LEDs appear in /sys/class/leds/. The maximum brightness of the

LED is defined in max_brightness file. The brightness file will set the brightness

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -5171,7 +5171,6 @@ F: include/linux/input/ 
INPUT MULTITOUCH (MT) PROTOCOL

M:	Henrik Rydberg <rydberg@bitmath.org>

L:	linux-input@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git

S:	Odd fixes

F:	Documentation/input/multi-touch-protocol.txt

F:	drivers/input/input-mt.c

drivers/input/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -25,6 +25,19 @@ config INPUT 


if INPUT



config INPUT_LEDS

	tristate "Export input device LEDs in sysfs"

	depends on LEDS_CLASS

	default INPUT

	help

	  Say Y here if you would like to export LEDs on input devices

	  as standard LED class devices in sysfs.



	  If unsure, say Y.



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

	  module will be called input-leds.



config INPUT_FF_MEMLESS

	tristate "Support for memoryless force-feedback devices"

	help