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

Commit 4937e2a6 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:
 "Updates for the input subsystem.  You will get an new drivers for
  Hyper-V synthetic keyboard and for Neonode zForce touchscreens, plus a
  bunch of driver fixes and cleanups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (49 commits)
  Revert "Input: ALPS - add support for model found on Dell XT2"
  arm: dts: am335x sk: add touchscreen support
  Input: ti_am335x_tsc - fix spelling mistake in TSC/ADC DT binding
  Input: cyttsp4 - replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
  Input: mma8450 - add missing i2c_set_clientdata() in mma8450_probe()
  Input: mpu3050 - add missing i2c_set_clientdata() in mpu3050_probe()
  Input: tnetv107x-keypad - make irqs signed for error handling
  Input: add driver for Neonode zForce based touchscreens
  Input: sh_keysc - enable the driver on all ARM platforms
  Input: remove a redundant max() call
  Input: mousedev - allow disabling even without CONFIG_EXPERT
  Input: allow deselecting serio drivers even without CONFIG_EXPERT
  Input: i8042 - add PNP modaliases
  Input: evdev - fall back to vmalloc for client event buffer
  Input: cypress_ps2 - do not consider data bad if palm is detected
  Input: cypress_ps2 - remove useless cast
  Input: fix PWM-related undefined reference errors
  Input: ALPS - change secondary device's name
  Input: wacom - not all multi-interface devices support touch
  Input: nspire-keypad - add missing clk_disable_unprepare() on error path
  ...
parents db0b2d01 42249094

Documentation/devicetree/bindings/input/touchscreen/ti-tsc-adc.txt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Required properties: 
	ti,wires: Wires refer to application modes i.e. 4/5/8 wire touchscreen

		  support on the platform.

	ti,x-plate-resistance: X plate resistance

	ti,coordiante-readouts: The sequencer supports a total of 16

	ti,coordinate-readouts: The sequencer supports a total of 16

				programmable steps each step is used to

				read a single coordinate. A single

                                readout is enough but multiple reads can

Documentation/input/gamepad.txt

+3 −0
Original line number Diff line number Diff line
@@ -122,12 +122,14 @@ D-Pad: 
      BTN_DPAD_*

    Analog buttons are reported as:

      ABS_HAT0X and ABS_HAT0Y

      (for ABS values negative is left/up, positive is right/down)



Analog-Sticks:

  The left analog-stick is reported as ABS_X, ABS_Y. The right analog stick is

  reported as ABS_RX, ABS_RY. Zero, one or two sticks may be present.

  If analog-sticks provide digital buttons, they are mapped accordingly as

  BTN_THUMBL (first/left) and BTN_THUMBR (second/right).

    (for ABS values negative is left/up, positive is right/down)



Triggers:

  Trigger buttons can be available as digital or analog buttons or both. User-
@@ -138,6 +140,7 @@ Triggers: 
  ABS_HAT2X (right/ZR) and BTN_TL2 or ABS_HAT2Y (left/ZL).

  If only one trigger-button combination is present (upper+lower), they are

  reported as "right" triggers (BTN_TR/ABS_HAT1X).

    (ABS trigger values start at 0, pressure is reported as positive values)



Menu-Pad:

  Menu buttons are always digital and are mapped according to their location

arch/arm/boot/dts/am335x-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ 
	tsc {

		ti,wires = <4>;

		ti,x-plate-resistance = <200>;

		ti,coordiante-readouts = <5>;

		ti,coordinate-readouts = <5>;

		ti,wire-config = <0x00 0x11 0x22 0x33>;

	};

arch/arm/boot/dts/am335x-evmsk.dts

+10 −0
Original line number Diff line number Diff line
@@ -485,3 +485,13 @@ 
		tx-num-evt = <1>;

		rx-num-evt = <1>;

};



&tscadc {

	status = "okay";

	tsc {

		ti,wires = <4>;

		ti,x-plate-resistance = <200>;

		ti,coordinate-readouts = <5>;

		ti,wire-config = <0x00 0x11 0x22 0x33>;

	};

};

drivers/input/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ config INPUT_MATRIXKMAP 
comment "Userland interfaces"



config INPUT_MOUSEDEV

	tristate "Mouse interface" if EXPERT

	tristate "Mouse interface"

	default y

	help

	  Say Y here if you want your mouse to be accessible as char devices