Commit 7bfe0e66 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:
 "- we finally merged driver for USB version of Synaptics touchpads
    (I guess most commonly found in IBM/Lenovo keyboard/touchpad combo);

   - a bunch of new drivers for embedded platforms (Cypress
     touchscreens, DA9052 OnKey, MAX8997-haptic, Ilitek ILI210x
     touchscreens, TI touchscreen);

   - input core allows clients to specify desired clock source for
     timestamps on input events (EVIOCSCLOCKID ioctl);

   - input core allows querying state of all MT slots for given event
     code via EVIOCGMTSLOTS ioctl;

   - various driver fixes and improvements."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (45 commits)
  Input: ili210x - add support for Ilitek ILI210x based touchscreens
  Input: altera_ps2 - use of_match_ptr()
  Input: synaptics_usb - switch to module_usb_driver()
  Input: convert I2C drivers to use module_i2c_driver()
  Input: convert SPI drivers to use module_spi_driver()
  Input: omap4-keypad - move platform_data to <linux/platform_data>
  Input: kxtj9 - who_am_i check value and initial data rate fixes
  Input: add driver support for MAX8997-haptic
  Input: tegra-kbc - revise device tree support
  Input: of_keymap - add device tree bindings for simple key matrices
  Input: wacom - fix physical size calculation for 3rd-gen Bamboo
  Input: twl4030-vibra - really switch from #if to #ifdef
  Input: hp680_ts_input - ensure arguments to request_irq and free_irq are compatible
  Input: max8925_onkey - avoid accessing input device too early
  Input: max8925_onkey - allow to be used as a wakeup source
  Input: atmel-wm97xx - convert to dev_pm_ops
  Input: atmel-wm97xx - set driver owner
  Input: add cyttsp touchscreen maintainer entry
  Input: cyttsp - remove useless checks in cyttsp_probe()
  Input: usbtouchscreen - add support for Data Modul EasyTouch TP 72037
  ...
parents 6a76a699 10ce3cc9

Documentation/devicetree/bindings/input/matrix-keymap.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
A simple common binding for matrix-connected key boards. Currently targeted at

defining the keys in the scope of linux key codes since that is a stable and

standardized interface at this time.



Required properties:

- linux,keymap: an array of packed 1-cell entries containing the equivalent

  of row, column and linux key-code. The 32-bit big endian cell is packed

  as:

	row << 24 | column << 16 | key-code



Optional properties:

Some users of this binding might choose to specify secondary keymaps for

cases where there is a modifier key such as a Fn key. Proposed names

for said properties are "linux,fn-keymap" or with another descriptive

word for the modifier other from "Fn".



Example:

	linux,keymap = < 0x00030012

			 0x0102003a >;

Documentation/devicetree/bindings/input/tegra-kbc.txt

+11 −6
Original line number Diff line number Diff line
@@ -3,16 +3,21 @@ 
Required properties:

- compatible: "nvidia,tegra20-kbc"



Optional properties:

- debounce-delay: delay in milliseconds per row scan for debouncing

- repeat-delay: delay in milliseconds before repeat starts

- ghost-filter: enable ghost filtering for this device

- wakeup-source: configure keyboard as a wakeup source for suspend/resume

Optional properties, in addition to those specified by the shared

matrix-keyboard bindings:



- linux,fn-keymap: a second keymap, same specification as the

  matrix-keyboard-controller spec but to be used when the KEY_FN modifier

  key is pressed.

- nvidia,debounce-delay-ms: delay in milliseconds per row scan for debouncing

- nvidia,repeat-delay-ms: delay in milliseconds before repeat starts

- nvidia,ghost-filter: enable ghost filtering for this device

- nvidia,wakeup-source: configure keyboard as a wakeup source for suspend/resume



Example:



keyboard: keyboard {

	compatible = "nvidia,tegra20-kbc";

	reg = <0x7000e200 0x100>;

	ghost-filter;

	nvidia,ghost-filter;

};

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -2109,6 +2109,13 @@ W: http://www.cyclades.com/ 
S:	Orphan

F:	drivers/net/wan/pc300*



CYTTSP TOUCHSCREEN DRIVER

M:      Javier Martinez Canillas <javier@dowhile0.org>

L:      linux-input@vger.kernel.org

S:      Maintained

F:      drivers/input/touchscreen/cyttsp*

F:      include/linux/input/cyttsp.h



DAMA SLAVE for AX.25

M:	Joerg Reuter <jreuter@yaina.de>

W:	http://yaina.de/jreuter/

arch/arm/mach-omap2/board-4430sdp.c

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/regulator/fixed.h>

#include <linux/leds.h>

#include <linux/leds_pwm.h>

#include <linux/platform_data/omap4-keypad.h>



#include <mach/hardware.h>

#include <asm/hardware/gic.h>

arch/arm/mach-omap2/devices.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/err.h>

#include <linux/slab.h>

#include <linux/of.h>

#include <linux/platform_data/omap4-keypad.h>



#include <mach/hardware.h>

#include <mach/irqs.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE