summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-11-04 01:51:26 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-12-16 06:46:12 +0100
commita4164863e150c4991d2ac965e3fc52f9d8df3d7e (patch)
treeeb6c186935b028730a2c440cb10121b6089dbdba /Documentation
parentmfd: stmpe: add pull up/down register offsets for STMPE (diff)
downloadlinux-a4164863e150c4991d2ac965e3fc52f9d8df3d7e.tar.xz
linux-a4164863e150c4991d2ac965e3fc52f9d8df3d7e.zip
Input: stmpe - enforce device tree only mode
The STMPE keypad controller is only used with device tree configured systems, so force the configuration to come from device tree only, and now actually get the rows and cols from the device tree too. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/input/stmpe-keypad.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/input/stmpe-keypad.txt b/Documentation/devicetree/bindings/input/stmpe-keypad.txt
index 1b97222e8a0b..12bb771d66d4 100644
--- a/Documentation/devicetree/bindings/input/stmpe-keypad.txt
+++ b/Documentation/devicetree/bindings/input/stmpe-keypad.txt
@@ -8,6 +8,8 @@ Optional properties:
- debounce-interval : Debouncing interval time in milliseconds
- st,scan-count : Scanning cycles elapsed before key data is updated
- st,no-autorepeat : If specified device will not autorepeat
+ - keypad,num-rows : See ./matrix-keymap.txt
+ - keypad,num-columns : See ./matrix-keymap.txt
Example: