summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-03 12:38:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-03 12:38:20 -0700
commit16a12fa9aed176444fc795b09e796be41902bb08 (patch)
treebd158def3263a8b0d0f0886fd0fcd32728242dc4
parentd25e436c4b68db2895185b24ad1f22499c2f87b0 (diff)
parent0337966d121ebebf73a1c346123e8112796e684e (diff)
downloadlinux-16a12fa9aed176444fc795b09e796be41902bb08.tar.gz
linux-16a12fa9aed176444fc795b09e796be41902bb08.tar.bz2
linux-16a12fa9aed176444fc795b09e796be41902bb08.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input subsystem updates from Dmitry Torokhov: - a big update from Mauro converting input documentation to ReST format - Synaptics PS/2 is now aware of SMBus companion devices, which means that we can now use native RMI4 protocol to handle touchpads, instead of relying on legacy PS/2 mode. - we removed support from BMA180 accelerometer from input devices as it is now handled properly by IIO - update to TSC2007 to corretcly report pressure - other miscellaneous driver fixes. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (152 commits) Input: ar1021_i2c - use BIT to check for a bit Input: twl4030-pwrbutton - use input_set_capability() helper Input: twl4030-pwrbutton - use correct device for irq request Input: ar1021_i2c - enable touch mode during open Input: add uinput documentation dt-bindings: input: add bindings document for ar1021_i2c driver dt-bindings: input: rotary-encoder: fix typo Input: xen-kbdfront - add module parameter for setting resolution ARM: pxa/raumfeld: fix compile error in rotary controller resources Input: xpad - do not suggest writing to Dominic Input: xpad - don't use literal blocks inside footnotes Input: xpad - note that usb/devices is now at /sys/kernel/debug/ Input: docs - freshen up introduction Input: docs - split input docs into kernel- and user-facing Input: docs - note that MT-A protocol is obsolete Input: docs - update joystick documentation a bit Input: docs - remove disclaimer/GPL notice Input: fix "Game console" heading level in joystick documentation Input: rotary-encoder - remove references to platform data from docs Input: move documentation for Amiga CD32 ...
-rw-r--r--Documentation/conf.py2
-rw-r--r--Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt2
-rw-r--r--Documentation/devicetree/bindings/input/pwm-beeper.txt1
-rw-r--r--Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.txt1
-rw-r--r--Documentation/devicetree/bindings/input/rotary-encoder.txt2
-rw-r--r--Documentation/devicetree/bindings/input/touchscreen/ad7879.txt19
-rw-r--r--Documentation/devicetree/bindings/input/touchscreen/ads7846.txt (renamed from Documentation/devicetree/bindings/input/ads7846.txt)0
-rw-r--r--Documentation/devicetree/bindings/input/touchscreen/ar1021.txt16
-rw-r--r--Documentation/devicetree/bindings/input/touchscreen/max11801-ts.txt18
-rw-r--r--Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt7
-rw-r--r--Documentation/input/cd32.txt19
-rw-r--r--Documentation/input/conf.py10
-rw-r--r--Documentation/input/devices/alps.rst (renamed from Documentation/input/alps.txt)45
-rw-r--r--Documentation/input/devices/amijoy.rst (renamed from Documentation/input/amijoy.txt)179
-rw-r--r--Documentation/input/devices/appletouch.rst (renamed from Documentation/input/appletouch.txt)45
-rw-r--r--Documentation/input/devices/atarikbd.rst (renamed from Documentation/input/atarikbd.txt)225
-rw-r--r--Documentation/input/devices/bcm5974.rst (renamed from Documentation/input/bcm5974.txt)43
-rw-r--r--Documentation/input/devices/cma3000_d0x.rst (renamed from Documentation/input/cma3000_d0x.txt)74
-rw-r--r--Documentation/input/devices/cs461x.rst (renamed from Documentation/input/cs461x.txt)28
-rw-r--r--Documentation/input/devices/edt-ft5x06.rst (renamed from Documentation/input/edt-ft5x06.txt)0
-rw-r--r--Documentation/input/devices/elantech.rst (renamed from Documentation/input/elantech.txt)306
-rw-r--r--Documentation/input/devices/gpio-tilt.rst103
-rw-r--r--Documentation/input/devices/iforce-protocol.rst381
-rw-r--r--Documentation/input/devices/index.rst19
-rw-r--r--Documentation/input/devices/joystick-parport.rst611
-rw-r--r--Documentation/input/devices/ntrig.rst (renamed from Documentation/input/ntrig.txt)49
-rw-r--r--Documentation/input/devices/rotary-encoder.rst (renamed from Documentation/input/rotary-encoder.txt)117
-rw-r--r--Documentation/input/devices/sentelic.rst901
-rw-r--r--Documentation/input/devices/walkera0701.rst (renamed from Documentation/input/walkera0701.txt)51
-rw-r--r--Documentation/input/devices/xpad.rst (renamed from Documentation/input/xpad.txt)143
-rw-r--r--Documentation/input/devices/yealink.rst (renamed from Documentation/input/yealink.txt)173
-rw-r--r--Documentation/input/event-codes.rst (renamed from Documentation/input/event-codes.txt)134
-rw-r--r--Documentation/input/ff.rst (renamed from Documentation/input/ff.txt)208
-rw-r--r--Documentation/input/gamepad.rst (renamed from Documentation/input/gamepad.txt)94
-rw-r--r--Documentation/input/gameport-programming.rst (renamed from Documentation/input/gameport-programming.txt)83
-rw-r--r--Documentation/input/gpio-tilt.txt103
-rw-r--r--Documentation/input/iforce-protocol.txt258
-rw-r--r--Documentation/input/index.rst20
-rw-r--r--Documentation/input/input-programming.rst (renamed from Documentation/input/input-programming.txt)268
-rw-r--r--Documentation/input/input.rst281
-rw-r--r--Documentation/input/input.txt290
-rw-r--r--Documentation/input/input_kapi.rst17
-rw-r--r--Documentation/input/input_uapi.rst22
-rw-r--r--Documentation/input/interactive.fig42
-rw-r--r--Documentation/input/interactive.svg24
-rw-r--r--Documentation/input/joydev/index.rst18
-rw-r--r--Documentation/input/joydev/joystick-api.rst (renamed from Documentation/input/joystick-api.txt)160
-rw-r--r--Documentation/input/joydev/joystick.rst585
-rw-r--r--Documentation/input/joystick-parport.txt542
-rw-r--r--Documentation/input/joystick.txt586
-rw-r--r--Documentation/input/multi-touch-protocol.rst (renamed from Documentation/input/multi-touch-protocol.txt)206
-rw-r--r--Documentation/input/notifier.rst (renamed from Documentation/input/notifier.txt)10
-rw-r--r--Documentation/input/sentelic.txt873
-rw-r--r--Documentation/input/shape.fig65
-rw-r--r--Documentation/input/shape.svg39
-rw-r--r--Documentation/input/uinput.rst245
-rw-r--r--Documentation/input/userio.rst (renamed from Documentation/input/userio.txt)79
-rw-r--r--MAINTAINERS4
-rw-r--r--arch/arm/mach-pxa/raumfeld.c24
-rw-r--r--drivers/i2c/i2c-boardinfo.c24
-rw-r--r--drivers/i2c/i2c-core.c34
-rw-r--r--drivers/input/gameport/gameport.c9
-rw-r--r--drivers/input/joystick/db9.c4
-rw-r--r--drivers/input/joystick/gamecon.c3
-rw-r--r--drivers/input/joystick/turbografx.c4
-rw-r--r--drivers/input/joystick/xpad.c114
-rw-r--r--drivers/input/keyboard/cros_ec_keyb.c7
-rw-r--r--drivers/input/keyboard/locomokbd.c5
-rw-r--r--drivers/input/keyboard/matrix_keypad.c13
-rw-r--r--drivers/input/keyboard/omap4-keypad.c2
-rw-r--r--drivers/input/keyboard/qt1070.c9
-rw-r--r--drivers/input/keyboard/tca8418_keypad.c2
-rw-r--r--drivers/input/misc/Kconfig2
-rw-r--r--drivers/input/misc/apanel.c3
-rw-r--r--drivers/input/misc/axp20x-pek.c62
-rw-r--r--drivers/input/misc/bma150.c11
-rw-r--r--drivers/input/misc/dm355evm_keys.c79
-rw-r--r--drivers/input/misc/drv260x.c4
-rw-r--r--drivers/input/misc/pm8xxx-vibrator.c78
-rw-r--r--drivers/input/misc/pwm-beeper.c15
-rw-r--r--drivers/input/misc/soc_button_array.c182
-rw-r--r--drivers/input/misc/twl4030-pwrbutton.c5
-rw-r--r--drivers/input/misc/wistron_btns.c5
-rw-r--r--drivers/input/misc/xen-kbdfront.c45
-rw-r--r--drivers/input/misc/yealink.h2
-rw-r--r--drivers/input/mouse/Kconfig16
-rw-r--r--drivers/input/mouse/Makefile2
-rw-r--r--drivers/input/mouse/alps.c76
-rw-r--r--drivers/input/mouse/alps.h6
-rw-r--r--drivers/input/mouse/psmouse-base.c216
-rw-r--r--drivers/input/mouse/psmouse-smbus.c302
-rw-r--r--drivers/input/mouse/psmouse.h102
-rw-r--r--drivers/input/mouse/synaptics.c980
-rw-r--r--drivers/input/mouse/synaptics.h154
-rw-r--r--drivers/input/mouse/synaptics_i2c.c9
-rw-r--r--drivers/input/rmi4/rmi_driver.c13
-rw-r--r--drivers/input/rmi4/rmi_f12.c18
-rw-r--r--drivers/input/rmi4/rmi_f34.c27
-rw-r--r--drivers/input/rmi4/rmi_f34.h7
-rw-r--r--drivers/input/rmi4/rmi_f34v7.c117
-rw-r--r--drivers/input/rmi4/rmi_i2c.c51
-rw-r--r--drivers/input/rmi4/rmi_smbus.c94
-rw-r--r--drivers/input/rmi4/rmi_spi.c44
-rw-r--r--drivers/input/serio/serio.c30
-rw-r--r--drivers/input/sparse-keymap.c39
-rw-r--r--drivers/input/touchscreen/Kconfig18
-rw-r--r--drivers/input/touchscreen/Makefile2
-rw-r--r--drivers/input/touchscreen/ad7879-i2c.c67
-rw-r--r--drivers/input/touchscreen/ad7879-spi.c131
-rw-r--r--drivers/input/touchscreen/ad7879.c152
-rw-r--r--drivers/input/touchscreen/ad7879.h14
-rw-r--r--drivers/input/touchscreen/ads7846.c2
-rw-r--r--drivers/input/touchscreen/ar1021_i2c.c30
-rw-r--r--drivers/input/touchscreen/eeti_ts.c226
-rw-r--r--drivers/input/touchscreen/imx6ul_tsc.c15
-rw-r--r--drivers/input/touchscreen/lpc32xx_ts.c13
-rw-r--r--drivers/input/touchscreen/max11801_ts.c7
-rw-r--r--drivers/input/touchscreen/melfas_mip4.c11
-rw-r--r--drivers/input/touchscreen/silead.c13
-rw-r--r--drivers/input/touchscreen/sur40.c2
-rw-r--r--drivers/input/touchscreen/tps6507x-ts.c33
-rw-r--r--drivers/input/touchscreen/tsc2007.h101
-rw-r--r--drivers/input/touchscreen/tsc2007_core.c (renamed from drivers/input/touchscreen/tsc2007.c)102
-rw-r--r--drivers/input/touchscreen/tsc2007_iio.c140
-rw-r--r--include/linux/i2c.h5
-rw-r--r--include/linux/input/eeti_ts.h10
-rw-r--r--include/linux/input/matrix_keypad.h3
-rw-r--r--include/linux/mfd/cros_ec_commands.h4