Commit 1b59bab5 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:
 "Just a swath of driver fixes and cleanups, no new drivers this time
  (although ALPS now supports one of the newer protocols, more to come)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
  Input: wacom - add support for DTU-1031
  Input: wacom - fix wacom->shared guards for dual input devices
  Input: edt_ft5x06 - use devm_* functions where appropriate
  Input: hyperv-keyboard - pass through 0xE1 prefix
  Input: logips2pp - fix spelling s/reciver/receiver/
  Input: delete non-required instances of include <linux/init.h>
  Input: twl4030-keypad - convert to using managed resources
  Input: twl6040-vibra - remove unneeded check for CONFIG_OF
  Input: twl4030-keypad - add device tree support
  Input: twl6040-vibra - add missing of_node_put
  Input: twl4030-vibra - add missing of_node_put
  Input: i8042 - cleanup SERIO_I8042 dependencies
  Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on x86
  Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on unicore32
  Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on sparc
  Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO for SH_CAYMAN
  Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on powerpc
  Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on mips
  Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on IA64
  Input: i8042 - select ARCH_MIGHT_HAVE_PC_SERIO on ARM/Footbridge
  ...
parents b788769e 55df811f

Documentation/devicetree/bindings/input/gpio-beeper.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
* GPIO beeper device tree bindings



Register a beeper connected to GPIO pin.



Required properties:

- compatible:	Should be "gpio-beeper".

- gpios:	From common gpio binding; gpio connection to beeper enable pin.



Example:

	beeper: beeper {

		compatible = "gpio-beeper";

		gpios = <&gpio3 23 GPIO_ACTIVE_HIGH>;

	};

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

0 → 100644
+41 −0
Original line number Diff line number Diff line 
* Texas Instruments tsc2007 touchscreen controller



Required properties:

- compatible: must be "ti,tsc2007".

- reg: I2C address of the chip.

- ti,x-plate-ohms: X-plate resistance in ohms.



Optional properties:

- gpios: the interrupt gpio the chip is connected to (trough the penirq pin).

  The penirq pin goes to low when the panel is touched.

  (see GPIO binding[1] for more details).

- interrupt-parent: the phandle for the gpio controller

  (see interrupt binding[0]).

- interrupts: (gpio) interrupt to which the chip is connected

  (see interrupt binding[0]).

- ti,max-rt: maximum pressure.

- ti,fuzzx: specifies the absolute input fuzz x value.

  If set, it will permit noise in the data up to +- the value given to the fuzz

  parameter, that is used to filter noise from the event stream.

- ti,fuzzy: specifies the absolute input fuzz y value.

- ti,fuzzz: specifies the absolute input fuzz z value.

- ti,poll-period: how much time to wait (in milliseconds) before reading again the

  values from the tsc2007.



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

[1]: Documentation/devicetree/bindings/gpio/gpio.txt



Example:

	&i2c1 {

		/* ... */

		tsc2007@49 {

			compatible = "ti,tsc2007";

			reg = <0x49>;

			interrupt-parent = <&gpio4>;

			interrupts = <0x0 0x8>;

			gpios = <&gpio4 0 0>;

			ti,x-plate-ohms = <180>;

		};



		/* ... */

	};

Documentation/devicetree/bindings/input/twl4030-keypad.txt

0 → 100644
+27 −0
Original line number Diff line number Diff line 
* TWL4030's Keypad Controller device tree bindings



TWL4030's Keypad controller is used to interface a SoC with a matrix-type

keypad device. The keypad controller supports multiple row and column lines.

A key can be placed at each intersection of a unique row and a unique column.

The keypad controller can sense a key-press and key-release and report the

event using a interrupt to the cpu.



This binding is based on the matrix-keymap binding with the following

changes:



 * keypad,num-rows and keypad,num-columns are required.



Required SoC Specific Properties:

- compatible: should be one of the following

   - "ti,twl4030-keypad": For controllers compatible with twl4030 keypad

      controller.

- interrupt: should be one of the following

   - <1>: For controllers compatible with twl4030 keypad controller.



Example:

	twl_keypad: keypad {

		compatible = "ti,twl4030-keypad";

		interrupts = <1>;

		keypad,num-rows = <8>;

		keypad,num-columns = <8>;

	};

Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Texas Instruments TWL family (twl4030) pwrbutton module



This module is part of the TWL4030. For more details about the whole

chip see Documentation/devicetree/bindings/mfd/twl-familly.txt.



This module provides a simple power button event via an Interrupt.



Required properties:

- compatible: should be one of the following

   - "ti,twl4030-pwrbutton": For controllers compatible with twl4030

- interrupts: should be one of the following

   - <8>: For controllers compatible with twl4030



Example:



&twl {

	twl_pwrbutton: pwrbutton {

		compatible = "ti,twl4030-pwrbutton";

		interrupts = <8>;

	};

};

Documentation/input/gamepad.txt

+3 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ features that you need, first. How each feature is mapped is described below. 
Legacy drivers often don't comply to these rules. As we cannot change them

for backwards-compatibility reasons, you need to provide fixup mappings in

user-space yourself. Some of them might also provide module-options that

change the mappings so you can adivce users to set these.

change the mappings so you can advise users to set these.



All new gamepads are supposed to comply with this mapping. Please report any

bugs, if they don't.
@@ -150,10 +150,10 @@ Menu-Pad: 
                  BTN_START

  Many pads also have a third button which is branded or has a special symbol

  and meaning. Such buttons are mapped as BTN_MODE. Examples are the Nintendo

  "HOME" button, the XBox "X"-button or Sony "P" button.

  "HOME" button, the XBox "X"-button or Sony "PS" button.



Rumble:

  Rumble is adverticed as FF_RUMBLE.

  Rumble is advertised as FF_RUMBLE.



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

  Written 2013 by David Herrmann <dh.herrmann@gmail.com>

CRA Git | Maintained and supported by SUSTech CRA and CCSE