Commit 51e771c0 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:
 "Drivers, drivers, drivers...  No interesting input core changes this
  time"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (74 commits)
  Input: elan_i2c - use iap_version to get firmware information
  Input: max8997_haptic - fix module alias
  Input: elan_i2c - fix typos for validpage_count
  Input: psmouse - add small delay for IBM trackpoint pass-through mode
  Input: synaptics - fix handling of disabling gesture mode
  Input: elan_i2c - enable ELAN0100 acpi panels
  Input: gpio-keys - report error when disabling unsupported key
  Input: sur40 - fix error return code
  Input: sentelic - silence some underflow warnings
  Input: zhenhua - switch to using bitrev8()
  Input: cros_ec_keyb - replace KEYBOARD_CROS_EC dependency
  Input: cap11xx - add LED support
  Input: elants_i2c - fix for devm_gpiod_get API change
  Input: elan_i2c - enable asynchronous probing
  Input: elants_i2c - enable asynchronous probing
  Input: elants_i2c - wire up regulator support
  Input: do not emit unneeded EV_SYN when suspending
  Input: elants_i2c - disable idle mode before updating firmware
  MAINTAINERS: Add maintainer for atmel_mxt_ts
  Input: atmel_mxt_ts - remove warning on zero T44 count
  ...
parents abebcdfb 01b944fe

Documentation/devicetree/bindings/input/ads7846.txt

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ Optional properties: 
					pendown-gpio (u32).

	pendown-gpio			GPIO handle describing the pin the !PENIRQ

					line is connected to.

	linux,wakeup			use any event on touchscreen as wakeup event.

	wakeup-source			use any event on touchscreen as wakeup event.





Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC::

Documentation/devicetree/bindings/input/cap11xx.txt

+19 −0
Original line number Diff line number Diff line
@@ -55,5 +55,24 @@ i2c_controller { 
				 <105>,		/* KEY_LEFT */

				 <109>,		/* KEY_PAGEDOWN */

				 <104>;		/* KEY_PAGEUP */



		#address-cells = <1>;

		#size-cells = <0>;



		usr@0 {

			label = "cap11xx:green:usr0";

			reg = <0>;

		};



		usr@1 {

			label = "cap11xx:green:usr1";

			reg = <1>;

		};



		alive@2 {

			label = "cap11xx:green:alive";

			reg = <2>;

			linux,default_trigger = "heartbeat";

		};

	};

}

Documentation/devicetree/bindings/input/cypress,cyapa.txt

0 → 100644
+44 −0
Original line number Diff line number Diff line 
Cypress I2C Touchpad



Required properties:

- compatible: must be "cypress,cyapa".

- reg: I2C address of the chip.

- interrupt-parent: a phandle for the interrupt controller (see interrupt

	binding[0]).

- interrupts: interrupt to which the chip is connected (see interrupt

	binding[0]).



Optional properties:

- wakeup-source: touchpad can be used as a wakeup source.

- pinctrl-names: should be "default" (see pinctrl binding [1]).

- pinctrl-0: a phandle pointing to the pin settings for the device (see

	pinctrl binding [1]).

- vcc-supply: a phandle for the regulator supplying 3.3V power.



[0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

[1]: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt



Example:

	&i2c0 {

		/* ... */



		/* Cypress Gen3 touchpad */

		touchpad@67 {

			compatible = "cypress,cyapa";

			reg = <0x24>;

			interrupt-parent = <&gpio>;

			interrupts = <2 IRQ_TYPE_EDGE_FALLING>;	/* GPIO 2 */

			wakeup-source;

		};



		/* Cypress Gen5 and later touchpad */

		touchpad@24 {

			compatible = "cypress,cyapa";

			reg = <0x24>;

			interrupt-parent = <&gpio>;

			interrupts = <2 IRQ_TYPE_EDGE_FALLING>;	/* GPIO 2 */

			wakeup-source;

		};



		/* ... */

	};

Documentation/devicetree/bindings/input/elants_i2c.txt

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ Optional properties: 
- pinctrl-names: should be "default" (see pinctrl binding [1]).

- pinctrl-0: a phandle pointing to the pin settings for the device (see

  pinctrl binding [1]).

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

- vcc33-supply: a phandle for the regulator supplying 3.3V power.

- vccio-supply: a phandle for the regulator supplying IO power.



[0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

[1]: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt

Documentation/devicetree/bindings/input/gpio-keys-polled.txt

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ Optional subnode-properties: 
	  If not specified defaults to <1> == EV_KEY.

	- debounce-interval: Debouncing interval time in milliseconds.

	  If not specified defaults to 5.

	- gpio-key,wakeup: Boolean, button can wake-up the system.

	- wakeup-source: Boolean, button can wake-up the system.



Example nodes:

CRA Git | Maintained and supported by SUSTech CRA and CCSE