diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-10-06 00:36:38 (GMT) |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-10-06 00:36:38 (GMT) |
| commit | 7b415285ae96f5bfa0fa95d3227c6900c4ff151d (patch) | |
| tree | feb5198f57bfb5b58aca24ddc76a313236f94512 /Documentation/devicetree/bindings/input | |
| parent | c65cf815653ec64e73d40819806c2d1aed91681e (diff) | |
| parent | 049e6dde7e57f0054fdc49102e7ef4830c698b46 (diff) | |
| download | linux-7b415285ae96f5bfa0fa95d3227c6900c4ff151d.tar.xz | |
Merge tag 'v4.3-rc4' into next
Merge with mainline to sync up with changes to parkbd driver.
Diffstat (limited to 'Documentation/devicetree/bindings/input')
| -rw-r--r-- | Documentation/devicetree/bindings/input/cypress,cyapa.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/input/cypress,cyapa.txt b/Documentation/devicetree/bindings/input/cypress,cyapa.txt index 635a3b0..8d91ba9 100644 --- a/Documentation/devicetree/bindings/input/cypress,cyapa.txt +++ b/Documentation/devicetree/bindings/input/cypress,cyapa.txt @@ -25,7 +25,7 @@ Example: /* Cypress Gen3 touchpad */ touchpad@67 { compatible = "cypress,cyapa"; - reg = <0x24>; + reg = <0x67>; interrupt-parent = <&gpio>; interrupts = <2 IRQ_TYPE_EDGE_FALLING>; /* GPIO 2 */ wakeup-source; |