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

Commit f7ebc4dc authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus 

Prepare first round of input updates for 4.2 merge window.
parents 469d7d22 84c88ef9

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

+1 −2
Original line number Original line 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,adt7476		+/-1C TDM Extended Temp Range I.C

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

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

adi,adxl345		Three-Axis Digital Accelerometer

adi,adxl345		Three-Axis Digital Accelerometer

adi,adxl346		Three-Axis Digital Accelerometer

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

adi,adxl34x		Three-Axis Digital Accelerometer

at,24c08		i2c serial eeprom  (24cxx)

at,24c08		i2c serial eeprom  (24cxx)

atmel,24c00		i2c serial eeprom  (24cxx)

atmel,24c00		i2c serial eeprom  (24cxx)

atmel,24c01		i2c serial eeprom  (24cxx)

atmel,24c01		i2c serial eeprom  (24cxx)

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

0 → 100644
+17 −0
Original line number Original line 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 Original line Diff line number Diff line
@@ -2,9 +2,6 @@ 
LED handling under Linux

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

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

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

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

MAINTAINERS

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

INPUT MULTITOUCH (MT) PROTOCOL

M:	Henrik Rydberg <rydberg@bitmath.org>

M:	Henrik Rydberg <rydberg@bitmath.org>

L:	linux-input@vger.kernel.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

S:	Odd fixes

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

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

F:	drivers/input/input-mt.c

F:	drivers/input/input-mt.c

drivers/input/Kconfig

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




if 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

config INPUT_FF_MEMLESS

	tristate "Support for memoryless force-feedback devices"

	tristate "Support for memoryless force-feedback devices"

	help

	help