aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-11-22 07:24:24 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2012-11-23 06:18:08 -0500
commitcc899bc3dce9101920b120abe413299f84233e29 (patch)
treeddd2d2bf18dc61489d248c3e66d4549bb0d878ab
parent916a871c48ef3ecbc4cac8f185c03160d0b42bfd (diff)
Documentation: Fix historical inconsistency in STMPE DT doc
Previously a generic binding 'i2c-client-wake' was created which enabled I2C devices to register themselves as wake-up devices. This binding was later over-thrown by 'wakeup-source'. The STMPE driver was fixed-up, but the document was neglected. This patch aims to rectify that. Cc: Samuel Ortiz <sameo@linux.intel.com> Cc: devicetree-discuss@lists.ozlabs.org Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--Documentation/devicetree/bindings/mfd/stmpe.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/mfd/stmpe.txt b/Documentation/devicetree/bindings/mfd/stmpe.txt
index 8f0aeda2e326..c98450887d5e 100644
--- a/Documentation/devicetree/bindings/mfd/stmpe.txt
+++ b/Documentation/devicetree/bindings/mfd/stmpe.txt
@@ -8,7 +8,7 @@ Optional properties:
8 - interrupts : The interrupt outputs from the controller 8 - interrupts : The interrupt outputs from the controller
9 - interrupt-controller : Marks the device node as an interrupt controller 9 - interrupt-controller : Marks the device node as an interrupt controller
10 - interrupt-parent : Specifies which IRQ controller we're connected to 10 - interrupt-parent : Specifies which IRQ controller we're connected to
11 - i2c-client-wake : Marks the input device as wakable 11 - wakeup-source : Marks the input device as wakable
12 - st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024 12 - st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024
13 13
14Example: 14Example:
@@ -20,6 +20,6 @@ Example:
20 interrupt-parent = <&gpio6>; 20 interrupt-parent = <&gpio6>;
21 interrupt-controller; 21 interrupt-controller;
22 22
23 i2c-client-wake; 23 wakeup-source;
24 st,autosleep-timeout = <1024>; 24 st,autosleep-timeout = <1024>;
25 }; 25 };