Merge branch 'next' into for-linus (f7ebc4dc) · Commits · e / devices / android_kernel_oneplus_sm8150

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)

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

+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

+0 −1

Original line number	Diff line number	Diff line
		@@ -5043,7 +5043,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

+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