diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-01-13 22:35:32 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-01-13 22:35:32 -0800 |
| commit | 4116941b7a703f8c770998bb3a59966608cb5bb2 (patch) | |
| tree | 32945b644b69e3fd1a9ba8cd7369cf62abc44ccd /Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt | |
| parent | e85bb0beb6498c0dffe18a2f1f16d575bc175c32 (diff) | |
| parent | 8fe28cb58bcb235034b64cbbb7550a8a43fd88be (diff) | |
| download | linux-4116941b7a703f8c770998bb3a59966608cb5bb2.tar.bz2 | |
Merge tag 'v4.20' into next
Merge with mainline to bring in the new APIs.
Diffstat (limited to 'Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt b/Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt index f517660a3204..ef2ae729718f 100644 --- a/Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt +++ b/Documentation/devicetree/bindings/input/cypress,tm2-touchkey.txt @@ -6,8 +6,6 @@ Required properties: * "cypress,midas-touchkey" - for the touchkey found on midas boards * "cypress,aries-touchkey" - for the touchkey found on aries boards - reg: I2C address of the chip. -- interrupt-parent: a phandle for the interrupt controller (see interrupt - binding[0]). - interrupts: interrupt to which the chip is connected (see interrupt binding[0]). - vcc-supply : internal regulator output. 1.8V |