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

Commit 2c01e7bc 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 layer updates from Dmitry Torokhov:
 - a bunch of new drivers (DA9052/53 touchscreenn controller, Synaptics
   Navpoint, LM8333 keypads, Wacom I2C touhscreen);
 - updates to existing touchpad drivers (ALPS, Sntelic);
 - Wacom driver now supports Intuos5;
 - device-tree bindings in numerous drivers;
 - other cleanups and fixes.

Fix annoying conflict in drivers/input/tablet/wacom_wac.c that I think
implies that the input layer device naming is broken, but let's see.  I
brough it up with Dmitry.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
  Input: matrix-keymap - fix building keymaps
  Input: spear-keyboard - document DT bindings
  Input: spear-keyboard - add device tree bindings
  Input: matrix-keymap - wire up device tree support
  Input: matrix-keymap - uninline and prepare for device tree support
  Input: adp5588 - add support for gpio names
  Input: omap-keypad - dynamically handle register offsets
  Input: synaptics - fix compile warning
  MAINTAINERS: adjust input-related patterns
  Input: ALPS - switch to using input_mt_report_finger_count
  Input: ALPS - add semi-MT support for v4 protocol
  Input: Add Synaptics NavPoint (PXA27x SSP/SPI) driver
  Input: atmel_mxt_ts - dump each message on just 1 line
  Input: atmel_mxt_ts - do not read extra (checksum) byte
  Input: atmel_mxt_ts - verify object size in mxt_write_object
  Input: atmel_mxt_ts - only allow root to update firmware
  Input: atmel_mxt_ts - use CONFIG_PM_SLEEP
  Input: sentelic - report device's production serial number
  Input: tl6040-vibra - Device Tree support
  Input: evdev - properly handle read/write with count 0
  ...
parents ab11ca34 e644dae6

Documentation/ABI/testing/sysfs-driver-wacom

+8 −7
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ Contact: linux-input@vger.kernel.org 
Description:

		Attribute group for control of the status LEDs and the OLEDs.

		This attribute group is only available for Intuos 4 M, L,

		and XL (with LEDs and OLEDs) and Cintiq 21UX2 and Cintiq 24HD

		(LEDs only). Therefore its presence implicitly signifies the

		presence of said LEDs and OLEDs on the tablet device.

		and XL (with LEDs and OLEDs), Intuos 5 (LEDs only), and Cintiq

		21UX2 and Cintiq 24HD (LEDs only). Therefore its presence

		implicitly signifies the presence of said LEDs and OLEDs on the

		tablet device.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status0_luminance

Date:		August 2011
@@ -48,10 +49,10 @@ What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led0 
Date:		August 2011

Contact:	linux-input@vger.kernel.org

Description:

		Writing to this file sets which one of the four (for Intuos 4)

		or of the right four (for Cintiq 21UX2 and Cintiq 24HD) status

		LEDs is active (0..3). The other three LEDs on the same side are

		always inactive.

		Writing to this file sets which one of the four (for Intuos 4

		and Intuos 5) or of the right four (for Cintiq 21UX2 and Cintiq

		24HD) status LEDs is active (0..3). The other three LEDs on the

		same side are always inactive.



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status_led1_select

Date:		September 2011

Documentation/devicetree/bindings/input/spear-keyboard.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
* SPEAr keyboard controller



Required properties:

- compatible: "st,spear300-kbd"



Optional properties, in addition to those specified by the shared

matrix-keyboard bindings:

- autorepeat: bool: enables key autorepeat

- st,mode: keyboard mode: 0 - 9x9, 1 - 6x6, 2 - 2x2



Example:



kbd@fc400000 {

	compatible = "st,spear300-kbd";

	reg = <0xfc400000 0x100>;

	linux,keymap = < 0x00030012

			 0x0102003a >;

	autorepeat;

	st,mode = <0>;

};

Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
* NXP LPC32xx SoC Touchscreen Controller (TSC)



Required properties:

- compatible: must be "nxp,lpc3220-tsc"

- reg: physical base address of the controller and length of memory mapped

  region.

- interrupts: The TSC/ADC interrupt



Example:



	tsc@40048000 {

		compatible = "nxp,lpc3220-tsc";

		reg = <0x40048000 0x1000>;

		interrupt-parent = <&mic>;

		interrupts = <39 0>;

	};

Documentation/devicetree/bindings/input/twl6040-vibra.txt

0 → 100644
+37 −0
Original line number Diff line number Diff line 
Vibra driver for the twl6040 family



The vibra driver is a child of the twl6040 MFD dirver.

Documentation/devicetree/bindings/mfd/twl6040.txt



Required properties:

- compatible : Must be "ti,twl6040-vibra";

- interrupts: 4, Vibra overcurrent interrupt

- vddvibl-supply: Regulator supplying the left vibra motor

- vddvibr-supply: Regulator supplying the right vibra motor

- vibldrv_res: Board specific left driver resistance

- vibrdrv_res: Board specific right driver resistance

- viblmotor_res: Board specific left motor resistance

- vibrmotor_res: Board specific right motor resistance



Optional properties:

- vddvibl_uV: If the vddvibl default voltage need to be changed

- vddvibr_uV: If the vddvibr default voltage need to be changed



Example:

/*

 * 8-channel high quality low-power audio codec

 * http://www.ti.com/lit/ds/symlink/twl6040.pdf

 */

twl6040: twl6040@4b {

	...

	twl6040_vibra: twl6040@1 {

		compatible = "ti,twl6040-vibra";

		interrupts = <4>;

		vddvibl-supply = <&vbat>;

		vddvibr-supply = <&vbat>;

		vibldrv_res = <8>;

		vibrdrv_res = <3>;

		viblmotor_res = <10>;

		vibrmotor_res = <10>;

	};

};

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -3465,6 +3465,8 @@ Q: http://patchwork.kernel.org/project/linux-input/list/ 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git

S:	Maintained

F:	drivers/input/

F:	include/linux/input.h

F:	include/linux/input/



INPUT MULTITOUCH (MT) PROTOCOL

M:	Henrik Rydberg <rydberg@euromail.se>