Commit 718749d5 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 first round of updates for the input subsystem.

  A few new drivers (power button handler for AXP20x PMIC, tps65218
  power button driver, sun4i keys driver, regulator haptic driver, NI
  Ettus Research USRP E3x0 button, Alwinner A10/A20 PS/2 controller).

  Updates to Synaptics and ALPS touchpad drivers (with more to come
  later), brand new Focaltech PS/2 support, update to Cypress driver to
  handle Gen5 (in addition to Gen3) devices, and number of other fixups
  to various drivers as well as input core"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (54 commits)
  Input: elan_i2c - fix wrong %p extension
  Input: evdev - do not queue SYN_DROPPED if queue is empty
  Input: gscps2 - fix MODULE_DEVICE_TABLE invocation
  Input: synaptics - use dmax in input_mt_assign_slots
  Input: pxa27x_keypad - remove unnecessary ARM includes
  Input: ti_am335x_tsc - replace delta filtering with median filtering
  ARM: dts: AM335x: Make charge delay a DT parameter for TSC
  Input: ti_am335x_tsc - read charge delay from DT
  Input: ti_am335x_tsc - remove udelay in interrupt handler
  Input: ti_am335x_tsc - interchange touchscreen and ADC steps
  Input: MT - add support for balanced slot assignment
  Input: drv2667 - remove wrong and unneeded drv2667-haptics modalias
  Input: drv260x - remove wrong and unneeded drv260x-haptics modalias
  Input: cap11xx - remove wrong and unneeded cap11xx modalias
  Input: sun4i-ts - add support for touchpanel controller on A31
  Input: serio - add support for Alwinner A10/A20 PS/2 controller
  Input: gtco - use sign_extend32() for sign extension
  Input: elan_i2c - verify firmware signature applying it
  Input: elantech - remove stale comment from Kconfig
  Input: cyapa - off by one in cyapa_update_fw_store()
  ...
parents e0c84537 4ba24fef

Documentation/ABI/testing/sysfs-driver-input-axp-pek

0 → 100644
+11 −0
Original line number Diff line number Diff line 
What:		/sys/class/input/input(x)/device/startup

Date:		March 2014

Contact:	Carlo Caione <carlo@caione.org>

Description:	Startup time in us. Board is powered on if the button is pressed

		for more than <startup_time>



What:		/sys/class/input/input(x)/device/shutdown

Date:		March 2014

Contact:	Carlo Caione <carlo@caione.org>

Description:	Shutdown time in us. Board is powered off if the button is pressed

		for more than <shutdown_time>

Documentation/devicetree/bindings/input/e3x0-button.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
National Instruments Ettus Research USRP E3x0 button driver



This module is part of the NI Ettus Research USRP E3x0 SDR.



This module provides a simple power button event via two interrupts.



Required properties:

- compatible: should be one of the following

  - "ettus,e3x0-button": For devices such as the NI Ettus Research USRP E3x0

- interrupt-parent:

  - a phandle to the interrupt controller that it is attached to.

- interrupts: should be one of the following

  - <0 30 1>, <0 31 1>: For devices such as the NI Ettus Research USRP E3x0

- interrupt-names: should be one of the following

  - "press", "release": For devices such as the NI Ettus Research USRP E3x0



Note: Interrupt numbers might vary depending on the FPGA configuration.



Example:

	button {

		compatible = "ettus,e3x0-button";

		interrupt-parent = <&intc>;

		interrupts = <0 30 1>, <0 31 1>;

		interrupt-names = "press", "release";

	}

Documentation/devicetree/bindings/input/regulator-haptic.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
* Regulator Haptic Device Tree Bindings



Required Properties:

 - compatible : Should be "regulator-haptic"

 - haptic-supply : Power supply to the haptic motor.

	[*] refer Documentation/devicetree/bindings/regulator/regulator.txt



 - max-microvolt : The maximum voltage value supplied to the haptic motor.

		[The unit of the voltage is a micro]



 - min-microvolt : The minimum voltage value supplied to the haptic motor.

		[The unit of the voltage is a micro]



Example:



	haptics {

		compatible = "regulator-haptic";

		haptic-supply = <&motor_regulator>;

		max-microvolt = <2700000>;

		min-microvolt = <1100000>;

	};

Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt

0 → 100644
+62 −0
Original line number Diff line number Diff line 
Allwinner sun4i low res adc attached tablet keys

------------------------------------------------



Required properties:

 - compatible: "allwinner,sun4i-a10-lradc-keys"

 - reg: mmio address range of the chip

 - interrupts: interrupt to which the chip is connected

 - vref-supply: powersupply for the lradc reference voltage



Each key is represented as a sub-node of "allwinner,sun4i-a10-lradc-keys":



Required subnode-properties:

	- label: Descriptive name of the key.

	- linux,code: Keycode to emit.

	- channel: Channel this key is attached to, mut be 0 or 1.

	- voltage: Voltage in µV at lradc input when this key is pressed.



Example:



#include <dt-bindings/input/input.h>



	lradc: lradc@01c22800 {

		compatible = "allwinner,sun4i-a10-lradc-keys";

		reg = <0x01c22800 0x100>;

		interrupts = <31>;

		vref-supply = <&reg_vcc3v0>;



		button@191 {

			label = "Volume Up";

			linux,code = <KEY_VOLUMEUP>;

			channel = <0>;

			voltage = <191274>;

		};



		button@392 {

			label = "Volume Down";

			linux,code = <KEY_VOLUMEDOWN>;

			channel = <0>;

			voltage = <392644>;

		};



		button@601 {

			label = "Menu";

			linux,code = <KEY_MENU>;

			channel = <0>;

			voltage = <601151>;

		};



		button@795 {

			label = "Enter";

			linux,code = <KEY_ENTER>;

			channel = <0>;

			voltage = <795090>;

		};



		button@987 {

			label = "Home";

			linux,code = <KEY_HOMEPAGE>;

			channel = <0>;

			voltage = <987387>;

		};

	};

Documentation/devicetree/bindings/input/touchscreen/sun4i.txt

+3 −1
Original line number Diff line number Diff line
@@ -2,9 +2,10 @@ sun4i resistive touchscreen controller 
--------------------------------------



Required properties:

 - compatible: "allwinner,sun4i-a10-ts"

 - compatible: "allwinner,sun4i-a10-ts" or "allwinner,sun6i-a31-ts"

 - reg: mmio address range of the chip

 - interrupts: interrupt to which the chip is connected

 - #thermal-sensor-cells: shall be 0



Optional properties:

 - allwinner,ts-attached: boolean indicating that an actual touchscreen is
@@ -17,4 +18,5 @@ Example: 
		reg = <0x01c25000 0x100>;

		interrupts = <29>;

		allwinner,ts-attached;

		#thermal-sensor-cells = <0>;

	};