From 7ff9e0e9c5637d0ee6b38c6e08bfad8c62201ccd Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Thu, 22 Nov 2012 12:24:24 +0000 Subject: [PATCH] --- yaml --- r: 345029 b: refs/heads/master c: cc899bc3dce9101920b120abe413299f84233e29 h: refs/heads/master i: 345027: 02d817975a0a4e06c185bbd1c0a5e4436d9e596b v: v3 --- [refs] | 2 +- trunk/Documentation/devicetree/bindings/mfd/stmpe.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9ab39f6d94f4..c1fb3f64ef09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 916a871c48ef3ecbc4cac8f185c03160d0b42bfd +refs/heads/master: cc899bc3dce9101920b120abe413299f84233e29 diff --git a/trunk/Documentation/devicetree/bindings/mfd/stmpe.txt b/trunk/Documentation/devicetree/bindings/mfd/stmpe.txt index 8f0aeda2e326..c98450887d5e 100644 --- a/trunk/Documentation/devicetree/bindings/mfd/stmpe.txt +++ b/trunk/Documentation/devicetree/bindings/mfd/stmpe.txt @@ -8,7 +8,7 @@ Optional properties: - interrupts : The interrupt outputs from the controller - interrupt-controller : Marks the device node as an interrupt controller - interrupt-parent : Specifies which IRQ controller we're connected to - - i2c-client-wake : Marks the input device as wakable + - wakeup-source : Marks the input device as wakable - st,autosleep-timeout : Valid entries (ms); 4, 16, 32, 64, 128, 256, 512 and 1024 Example: @@ -20,6 +20,6 @@ Example: interrupt-parent = <&gpio6>; interrupt-controller; - i2c-client-wake; + wakeup-source; st,autosleep-timeout = <1024>; };