diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-11 20:51:25 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-11 20:51:25 +0300 |
| commit | 62d5bdf972ebcfc99f72f734ae979713e4ca6450 (patch) | |
| tree | 690d4210d454808196c32efca408b46ffec9a5d3 /Documentation/devicetree/bindings/input/touchscreen | |
| parent | e52d83986c5a0b843e45aa89b84d224ba7b9b8ca (diff) | |
| parent | 48147b9768b83265bf2e1211bcadeca035011380 (diff) | |
| download | linux-62d5bdf972ebcfc99f72f734ae979713e4ca6450.tar.xz | |
Merge branch 'synaptics-rmi4' into next
Bring in support for devices using Synaptics RMI4 protocol, including
RMI4 bus, 2D sensor and button handlers, and SPI and I2C interface
drivers.
Diffstat (limited to 'Documentation/devicetree/bindings/input/touchscreen')
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt b/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt index ac23caf518ad..bccaa4e73045 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt @@ -18,6 +18,8 @@ Optional properties for Touchscreens: - touchscreen-inverted-y : Y axis is inverted (boolean) - touchscreen-swapped-x-y : X and Y axis are swapped (boolean) Swapping is done after inverting the axis + - touchscreen-x-mm : horizontal length in mm of the touchscreen + - touchscreen-y-mm : vertical length in mm of the touchscreen Deprecated properties for Touchscreens: - x-size : deprecated name for touchscreen-size-x |