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

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

Merge branch 'next' into for-linus 

Prepare first round of input updates for 4.8 merge window.
parents e9003c9c 0097ff3d

Documentation/devicetree/bindings/input/atmel,captouch.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
Device tree bindings for Atmel capacitive touch device, typically

an Atmel touch sensor connected to AtmegaXX MCU running firmware

based on Qtouch library.



The node for this device must be a child of a I2C controller node, as the

device communicates via I2C.



Required properties:



	compatible:	Must be "atmel,captouch".

	reg:		The I2C slave address of the device.

	interrupts:	Property describing the interrupt line the device

			is connected to. The device only has one interrupt

			source.

	linux,keycodes:	Specifies an array of numeric keycode values to

			be used for reporting button presses. The array can

			contain up to 8 entries.



Optional properties:



	autorepeat:	Enables the Linux input system's autorepeat

			feature on the input device.



Example:



	atmel-captouch@51 {

		compatible = "atmel,captouch";

		reg = <0x51>;

		interrupt-parent = <&tlmm>;

		interrupts = <67 IRQ_TYPE_EDGE_FALLING>;

		linux,keycodes = <BTN_0>, <BTN_1>,

			<BTN_2>, <BTN_3>,

			<BTN_4>, <BTN_5>,

			<BTN_6>, <BTN_7>;

		autorepeat;

	};

Documentation/devicetree/bindings/input/raydium_i2c_ts.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Raydium I2C touchscreen



Required properties:

- compatible: must be "raydium,rm32380"

- reg: The I2C address of the device

- interrupt-parent: the phandle for the interrupt controller

- interrupts: interrupt to which the chip is connected

    See ../interrupt-controller/interrupts.txt

Optional properties:

- avdd-supply: analog power supply needed to power device

- vccio-supply: IO Power source

- reset-gpios: reset gpio the chip is connected to.



Example:

	touchscreen@39 {

		compatible = "raydium,rm32380";

		reg = <0x39>;

		interrupt-parent = <&gpio>;

		interrupts = <0x0 IRQ_TYPE_EDGE_FALLING>;

	};

Documentation/devicetree/bindings/input/rmi4/rmi_i2c.txt

+9 −0
Original line number Diff line number Diff line
@@ -22,6 +22,15 @@ See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt 
- syna,reset-delay-ms: The number of milliseconds to wait after resetting the

			device.



- syna,startup-delay-ms: The number of milliseconds to wait after powering on

			 the device.



- vdd-supply: VDD power supply.

See ../regulator/regulator.txt



- vio-supply: VIO power supply

See ../regulator/regulator.txt



Function Parameters:

Parameters specific to RMI functions are contained in child nodes of the rmi device

 node. Documentation for the parameters of each function can be found in:

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ raidsonic RaidSonic Technology GmbH 
ralink	Mediatek/Ralink Technology Corp.

ramtron	Ramtron International

raspberrypi	Raspberry Pi Foundation

raydium	Raydium Semiconductor Corp.

realtek Realtek Semiconductor Corp.

renesas	Renesas Electronics Corporation

richtek	Richtek Technology Corporation

drivers/input/input-mt.c

+16 −1
Original line number Diff line number Diff line
@@ -218,8 +218,23 @@ void input_mt_report_pointer_emulation(struct input_dev *dev, bool use_count) 
	}



	input_event(dev, EV_KEY, BTN_TOUCH, count > 0);

	if (use_count)



	if (use_count) {

		if (count == 0 &&

		    !test_bit(ABS_MT_DISTANCE, dev->absbit) &&

		    test_bit(ABS_DISTANCE, dev->absbit) &&

		    input_abs_get_val(dev, ABS_DISTANCE) != 0) {

			/*

			 * Force reporting BTN_TOOL_FINGER for devices that

			 * only report general hover (and not per-contact

			 * distance) when contact is in proximity but not

			 * on the surface.

			 */

			count = 1;

		}



		input_mt_report_finger_count(dev, count);

	}



	if (oldest) {

		int x = input_mt_get_value(oldest, ABS_MT_POSITION_X);