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

Commit 10fdfee7 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 updates from Dmitry Torokhov:
 "The most notable item is addition of support for Synaptics RMI4
  protocol which is native protocol for all current Synaptics devices
  (touchscreens, touchpads).  In later releases we'll switch devices
  using HID and PS/2 protocol emulation to RMI4.

  You will also get:
   - BYD PS/2 touchpad protocol support for psmouse
   - MELFAS MIP4 Touchscreen driver
   - rotary encoder was moved away from legacy platform data and to
     generic device properties API, devm_* API, and can now handle
     encoders using more than 2 GPIOs
   - Cypress touchpad driver was switched to devm_* API and device
     properties
   - other assorted driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
  ARM: pxa/raumfeld: use PROPERTY_ENTRY_INTEGER to define props
  Input: synaptics-rmi4 - using logical instead of bitwise AND
  Input: powermate - fix oops with malicious USB descriptors
  Input: snvs_pwrkey - fix returned value check of syscon_regmap_lookup_by_phandle()
  MAINTAINERS: add devicetree bindings to Input Drivers section
  Input: synaptics-rmi4 - add device tree support to the SPI transport driver
  Input: synaptics-rmi4 - add SPI transport driver
  Input: synaptics-rmi4 - add support for F30
  Input: synaptics-rmi4 - add support for F12
  Input: synaptics-rmi4 - add device tree support for 2d sensors and F11
  Input: synaptics-rmi4 - add support for 2D sensors and F11
  Input: synaptics-rmi4 - add device tree support for RMI4 I2C devices
  Input: synaptics-rmi4 - add I2C transport driver
  Input: synaptics-rmi4 - add support for Synaptics RMI4 devices
  Input: ad7879 - add device tree support
  Input: ad7879 - fix default x/y axis assignment
  Input: ad7879 - move header to platform_data directory
  Input: ts4800 - add hardware dependency
  Input: cyapa - fix for losing events during device power transitions
  Input: sh_keysc - remove dependency on SUPERH
  ...
parents 0f49fc95 4d2508a5

Documentation/devicetree/bindings/goldfish/events.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Android Goldfish Events Keypad



Android goldfish events keypad device generated by android emulator.



Required properties:



- compatible : should contain "google,goldfish-events-keypad" to match emulator

- reg        : <registers mapping>

- interrupts : <interrupt mapping>



Example:



	goldfish-events@9040000 {

		compatible = "google,goldfish-events-keypad";

		reg = <0x9040000 0x1000>;

		interrupts = <0x5>;

	};

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

0 → 100644
+56 −0
Original line number Diff line number Diff line 
Synaptics RMI4 2D Sensor Device Binding



The Synaptics RMI4 core is able to support RMI4 devices using different

transports and different functions. This file describes the device tree

bindings for devices which contain 2D sensors using Function 11 or

Function 12. Complete documentation for transports and other functions

can be found in:

Documentation/devicetree/bindings/input/rmi4.



RMI4 Function 11 and Function 12 are for 2D touch position sensing.

Additional documentation for F11 can be found at:

http://www.synaptics.com/sites/default/files/511-000136-01-Rev-E-RMI4-Interfacing-Guide.pdf



Optional Touch Properties:

Description in Documentation/devicetree/bindings/input/touch

- touchscreen-inverted-x

- touchscreen-inverted-y

- touchscreen-swapped-x-y

- touchscreen-x-mm

- touchscreen-y-mm



Optional Properties:

- syna,clip-x-low: Sets a minimum value for X.

- syna,clip-y-low: Sets a minimum value for Y.

- syna,clip-x-high: Sets a maximum value for X.

- syna,clip-y-high: Sets a maximum value for Y.

- syna,offset-x: Add an offset to X.

- syna,offset-y: Add an offset to Y.

- syna,delta-x-threshold: Set the minimum distance on the X axis required

				to generate an interrupt in reduced reporting

				mode.

- syna,delta-y-threshold: Set the minimum distance on the Y axis required

				to generate an interrupt in reduced reporting

				mode.

- syna,sensor-type: Set the sensor type. 1 for touchscreen 2 for touchpad.

- syna,disable-report-mask: Mask for disabling posiiton reporting. Used to

				disable reporing absolute position data.

- syna,rezero-wait-ms: Time in miliseconds to wait after issuing a rezero

				command.





Example of a RMI4 I2C device with F11:

Example:

	&i2c1 {

		rmi4-i2c-dev@2c {

			compatible = "syna,rmi4-i2c";



			...



			rmi4-f11@11 {

				reg = <0x11>;

				touchscreen-inverted-y;

				syna,sensor-type = <2>;

			};

		};

	};

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

0 → 100644
+39 −0
Original line number Diff line number Diff line 
Synaptics RMI4 F01 Device Binding



The Synaptics RMI4 core is able to support RMI4 devices using different

transports and different functions. This file describes the device tree

bindings for devices which contain Function 1. Complete documentation

for transports and other functions can be found in:

Documentation/devicetree/bindings/input/rmi4.



Additional documentation for F01 can be found at:

http://www.synaptics.com/sites/default/files/511-000136-01-Rev-E-RMI4-Interfacing-Guide.pdf



Optional Properties:

- syna,nosleep-mode: If set the device will run at full power without sleeping.

			nosleep has 3 modes, 0 will not change the default

			setting, 1 will disable nosleep (allow sleeping),

			and 2 will enable nosleep (disabling sleep).

- syna,wakeup-threshold: Defines the amplitude of the disturbance to the

				background capacitance that will cause the

				device to wake from dozing.

- syna,doze-holdoff-ms: The delay to wait after the last finger lift and the

				first doze cycle.

- syna,doze-interval-ms: The time period that the device sleeps between finger

				activity.





Example of a RMI4 I2C device with F01:

	Example:

	&i2c1 {

		rmi4-i2c-dev@2c {

			compatible = "syna,rmi4-i2c";



			...



			rmi4-f01@1 {

				reg = <0x1>;

				syna,nosleep-mode = <1>;

			};

		};

	};

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

0 → 100644
+53 −0
Original line number Diff line number Diff line 
Synaptics RMI4 I2C Device Binding



The Synaptics RMI4 core is able to support RMI4 devices using different

transports and different functions. This file describes the device tree

bindings for devices using the I2C transport driver. Complete documentation

for other transports and functions can be found in

Documentation/devicetree/bindings/input/rmi4.



Required Properties:

- compatible: syna,rmi4-i2c

- reg: I2C address

- #address-cells: Set to 1 to indicate that the function child nodes

		    consist of only on uint32 value.

- #size-cells: Set to 0 to indicate that the function child nodes do not

		have a size property.



Optional Properties:

- interrupts: interrupt which the rmi device is connected to.

- interrupt-parent: The interrupt controller.

See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt



- syna,reset-delay-ms: The number of milliseconds to wait after resetting the

			device.



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/input/rmi4/rmi_f*.txt.







Example:

	&i2c1 {

		rmi4-i2c-dev@2c {

			compatible = "syna,rmi4-i2c";

			reg = <0x2c>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupt-parent = <&gpio>;

			interrupts = <4 2>;



			rmi4-f01@1 {

				reg = <0x1>;

				syna,nosleep-mode = <1>;

			};



			rmi4-f11@11 {

				reg = <0x11>;

				touchscreen-inverted-y;

				syna,sensor-type = <2>;

			};

		};

	};

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

0 → 100644
+57 −0
Original line number Diff line number Diff line 
Synaptics RMI4 SPI Device Binding



The Synaptics RMI4 core is able to support RMI4 devices using different

transports and different functions. This file describes the device tree

bindings for devices using the SPI transport driver. Complete documentation

for other transports and functions can be found in

Documentation/devicetree/bindings/input/rmi4.



Required Properties:

- compatible: syna,rmi4-spi

- reg: Chip select address for the device

- #address-cells: Set to 1 to indicate that the function child nodes

		    consist of only on uint32 value.

- #size-cells: Set to 0 to indicate that the function child nodes do not

		have a size property.



Optional Properties:

- interrupts: interrupt which the rmi device is connected to.

- interrupt-parent: The interrupt controller.

See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt



- spi-rx-delay-us: microsecond delay after a read transfer.

- spi-tx-delay-us: microsecond delay after a write transfer.



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/input/rmi4/rmi_f*.txt.







Example:

	spi@7000d800 {

		rmi4-spi-dev@0 {

			compatible = "syna,rmi4-spi";

			reg = <0x0>;

			#address-cells = <1>;

			#size-cells = <0>;

			spi-max-frequency = <4000000>;

			spi-cpha;

			spi-cpol;

			interrupt-parent = <&gpio>;

			interrupts = <TEGRA_GPIO(K, 2) 0x2>;

			spi-rx-delay-us = <30>;



			rmi4-f01@1 {

				reg = <0x1>;

				syna,nosleep-mode = <1>;

			};



			rmi4-f11@11 {

				reg = <0x11>;

				touchscreen-inverted-y;

				syna,sensor-type = <2>;

			};

		};

	};