Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-block.git] / Documentation / devicetree / bindings / input / touchscreen / touchscreen.txt

diff --git a/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt b/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
index d092d5d033a0dfdb45f2f4486da1527aa6e03b44..8641a2d70851822c109a52f237b52824c26bd0bb 100644 (file)
--- a/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
@@ -1,10 +1,12 @@
 General Touchscreen Properties:
 
 Optional properties for Touchscreens:
+ - touchscreen-min-x           : minimum x coordinate reported (0 if not set)
+ - touchscreen-min-y           : minimum y coordinate reported (0 if not set)
  - touchscreen-size-x          : horizontal resolution of touchscreen
-                                 (in pixels)
+                                 (maximum x coordinate reported + 1)
  - touchscreen-size-y          : vertical resolution of touchscreen
-                                 (in pixels)
+                                 (maximum y coordinate reported + 1)
  - touchscreen-max-pressure    : maximum reported pressure (arbitrary range
                                  dependent on the controller)
  - touchscreen-min-pressure    : minimum pressure on the touchscreen to be