summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-05-02 17:34:42 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2018-05-02 17:34:42 -1000
commitecd649b3408408841d5793038b0241e55ac7a141 (patch)
treed328847d78bed378cd53dce8c7f25fb5cfdc6352 /Documentation
parent3b6f979319c86d73c48d27deca68331e7924c209 (diff)
parentf6eeb9e548572c0e64632672dbd04363cbdd4eed (diff)
downloadlinux-stable-ecd649b3408408841d5793038b0241e55ac7a141.tar.gz
linux-stable-ecd649b3408408841d5793038b0241e55ac7a141.tar.bz2
linux-stable-ecd649b3408408841d5793038b0241e55ac7a141.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: "Just a few driver fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: atmel_mxt_ts - add missing compatible strings to OF device table Input: atmel_mxt_ts - fix the firmware update Input: atmel_mxt_ts - add touchpad button mapping for Samsung Chromebook Pro MAINTAINERS: Rakesh Iyer can't be reached anymore Input: hideep_ts - fix a typo in Kconfig Input: alps - fix reporting pressure of v3 trackstick Input: leds - fix out of bound access Input: synaptics-rmi4 - fix an unchecked out of memory error path
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/input/atmel,maxtouch.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
index 23e3abc3fdef..c88919480d37 100644
--- a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
+++ b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
@@ -4,6 +4,13 @@ Required properties:
- compatible:
atmel,maxtouch
+ The following compatibles have been used in various products but are
+ deprecated:
+ atmel,qt602240_ts
+ atmel,atmel_mxt_ts
+ atmel,atmel_mxt_tp
+ atmel,mXT224
+
- reg: The I2C address of the device
- interrupts: The sink for the touchpad's IRQ output