diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-04 22:32:40 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-04 22:32:40 +0300 |
| commit | 52cdce8adb635746f53306ab2599ca64902bb1dc (patch) | |
| tree | 0b61680c30eb150796cf01186f15b4845cdee6dd /Documentation/devicetree/bindings/input | |
| parent | 3cd47869431d7402d0613cf0f7fbb392f2b97565 (diff) | |
| parent | 7dde4e74744772efdc85d7ed13495c7b6a0d881b (diff) | |
| download | linux-52cdce8adb635746f53306ab2599ca64902bb1dc.tar.xz | |
Merge branch 'rotary-encoder' into next
Bring in updates to roraty encoder driver switching it away from legacy
platform data and over to generic device properties and adding support
for encoders using more than 2 GPIOs.
Diffstat (limited to 'Documentation/devicetree/bindings/input')
| -rw-r--r-- | Documentation/devicetree/bindings/input/rotary-encoder.txt | 2 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/input/rotary-encoder.txt b/Documentation/devicetree/bindings/input/rotary-encoder.txt index de99cbbbf6da..6c9f0c8a846c 100644 --- a/Documentation/devicetree/bindings/input/rotary-encoder.txt +++ b/Documentation/devicetree/bindings/input/rotary-encoder.txt @@ -1,7 +1,7 @@ Rotary encoder DT bindings Required properties: -- gpios: a spec for two GPIOs to be used +- gpios: a spec for at least two GPIOs to be used, most significant first Optional properties: - linux,axis: the input subsystem axis to map to this rotary encoder. diff --git a/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt b/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt index b9c32f6fd687..4357e498ef04 100644 --- a/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt +++ b/Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt @@ -12,7 +12,7 @@ Each key is represented as a sub-node of "allwinner,sun4i-a10-lradc-keys": Required subnode-properties: - label: Descriptive name of the key. - linux,code: Keycode to emit. - - channel: Channel this key is attached to, mut be 0 or 1. + - channel: Channel this key is attached to, must be 0 or 1. - voltage: Voltage in µV at lradc input when this key is pressed. Example: |