Commit 31564cbd 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 second round of input updates from Dmitry Torokhov:
 "As usual, there are a couple of new drivers, input core now supports
  managed input devices (devres), a slew of drivers now have device tree
  support and a bunch of fixes and cleanups."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (71 commits)
  Input: walkera0701 - fix crash on startup
  Input: matrix-keymap - provide a proper module license
  Input: gpio_keys_polled - switch to using gpio_request_one()
  Input: gpio_keys - switch to using gpio_request_one()
  Input: wacom - fix touch support for Bamboo Fun CTH-461
  Input: xpad - add a few new VID/PID combinations
  Input: xpad - minor formatting fixes
  Input: gpio-keys-polled - honor 'autorepeat' setting in platform data
  Input: tca8418-keypad - switch to using managed resources
  Input: tca8418_keypad - increase severity of failures in probe()
  Input: tca8418_keypad - move device ID tables closer to where they are used
  Input: tca8418_keypad - use dev_get_platdata() to retrieve platform data
  Input: tca8418_keypad - use a temporary variable for parent device
  Input: tca8418_keypad - add support for shared interrupt
  Input: tca8418_keypad - add support for device tree bindings
  Input: remove Compaq iPAQ H3600 (Bitsy) touchscreen driver
  Input: bu21013_ts - add support for Device Tree booting
  Input: bu21013_ts - move GPIO init and exit functions into the driver
  Input: bu21013_ts - request regulator that actually exists
  ARM: ux500: Strip out duplicate touch screen platform information
  ...
parents 6842d98d 022573c2

Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt

0 → 100644
+46 −0
Original line number Diff line number Diff line 
* GPIO driven matrix keypad device tree bindings



GPIO driven matrix keypad is used to interface a SoC with a matrix keypad.

The matrix keypad supports multiple row and column lines, a key can be

placed at each intersection of a unique row and a unique column. The matrix

keypad can sense a key-press and key-release by means of GPIO lines and

report the event using GPIO interrupts to the cpu.



Required Properties:

- compatible:		Should be "gpio-matrix-keypad"

- row-gpios:		List of gpios used as row lines. The gpio specifier

			for this property depends on the gpio controller to

			which these row lines are connected.

- col-gpios:		List of gpios used as column lines. The gpio specifier

			for this property depends on the gpio controller to

			which these column lines are connected.

- linux,keymap:		The definition can be found at

			bindings/input/matrix-keymap.txt



Optional Properties:

- linux,no-autorepeat:	do no enable autorepeat feature.

- linux,wakeup:		use any event on keypad as wakeup event.

- debounce-delay-ms:	debounce interval in milliseconds

- col-scan-delay-us:	delay, measured in microseconds, that is needed

			before we can scan keypad after activating column gpio



Example:

	matrix-keypad {

		compatible = "gpio-matrix-keypad";

		debounce-delay-ms = <5>;

		col-scan-delay-us = <2>;



		row-gpios = <&gpio2 25 0

			     &gpio2 26 0

			     &gpio2 27 0>;



		col-gpios = <&gpio2 21 0

			     &gpio2 22 0>;



		linux,keymap = <0x0000008B

				0x0100009E

				0x02000069

				0x0001006A

				0x0101001C

				0x0201006C>;

	};

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

0 → 100644
+7 −0
Original line number Diff line number Diff line 
* PWM beeper device tree bindings



Registers a PWM device as beeper.



Required properties:

- compatible: should be "pwm-beeper"

- pwms: phandle to the physical PWM device

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

0 → 100644
+39 −0
Original line number Diff line number Diff line 
* STMPE Keypad



Required properties:

 - compatible               : "st,stmpe-keypad"

 - linux,keymap             : See ./matrix-keymap.txt



Optional properties:

 - debounce-interval        : Debouncing interval time in milliseconds

 - st,scan-count            : Scanning cycles elapsed before key data is updated

 - st,no-autorepeat         : If specified device will not autorepeat



Example:



	stmpe_keypad {

		compatible = "st,stmpe-keypad";



		debounce-interval = <64>;

		st,scan-count = <8>;

		st,no-autorepeat;



		linux,keymap = <0x205006b

				0x4010074

				0x3050072

				0x1030004

				0x502006a

				0x500000a

				0x5008b

				0x706001c

				0x405000b

				0x6070003

				0x3040067

				0x303006c

				0x60400e7

				0x602009e

				0x4020073

				0x5050002

				0x4030069

				0x3020008>;

	};

Documentation/devicetree/bindings/input/tca8418_keypad.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 


Required properties:

- compatible: "ti,tca8418"

- reg: the I2C address

- interrupts: IRQ line number, should trigger on falling edge

- keypad,num-rows: The number of rows

- keypad,num-columns: The number of columns

- linux,keymap: Keys definitions, see keypad-matrix.

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

0 → 100644
+34 −0
Original line number Diff line number Diff line 
* MELFAS MMS114 touchscreen controller



Required properties:

- compatible: must be "melfas,mms114"

- reg: I2C address of the chip

- interrupts: interrupt to which the chip is connected

- x-size: horizontal resolution of touchscreen

- y-size: vertical resolution of touchscreen



Optional properties:

- contact-threshold:

- moving-threshold:

- x-invert: invert X axis

- y-invert: invert Y axis



Example:



	i2c@00000000 {

		/* ... */



		touchscreen@48 {

			compatible = "melfas,mms114";

			reg = <0x48>;

			interrupts = <39 0>;

			x-size = <720>;

			y-size = <1280>;

			contact-threshold = <10>;

			moving-threshold = <10>;

			x-invert;

			y-invert;

		};



		/* ... */

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE