diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-10-22 12:04:33 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-10-22 12:04:33 -0700 |
| commit | cacd9759eea2f1c7e8792ecd91ed4602f963b1a5 (patch) | |
| tree | 59281a932bf0b3d736044eb33067cf1507ada1d7 /Documentation | |
| parent | 13c1c5e4d7f887cba36c5e3df3faa22071c1469f (diff) | |
| parent | f39f8688888ae74fa8deae2d01289b69b4727394 (diff) | |
| download | linux-cacd9759eea2f1c7e8792ecd91ed4602f963b1a5.tar.bz2 | |
Merge branch 'next' into for-linus
Prepare input updates for 4.20 merge window.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/input/pwm-vibrator.txt | 4 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/input/pwm-vibrator.txt b/Documentation/devicetree/bindings/input/pwm-vibrator.txt index 09145d18491d..88c775a3fe21 100644 --- a/Documentation/devicetree/bindings/input/pwm-vibrator.txt +++ b/Documentation/devicetree/bindings/input/pwm-vibrator.txt @@ -58,8 +58,8 @@ Example from Motorola Droid 4: vibrator { compatible = "pwm-vibrator"; - pwms = <&pwm8 0 1000000000 0>, - <&pwm9 0 1000000000 0>; + pwms = <&pwm9 0 1000000000 0>, + <&pwm8 0 1000000000 0>; pwm-names = "enable", "direction"; direction-duty-cycle-ns = <1000000000>; }; diff --git a/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt b/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt index 537643e86f61..8aff9551259f 100644 --- 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-fuzz-x : horizontal noise value of the absolute input |