Merge branch 'cpuidle' into release

[karo-tx-linux.git] / Documentation / devicetree / bindings / mfd / tc3589x.txt

diff --git a/Documentation/devicetree/bindings/mfd/tc3589x.txt b/Documentation/devicetree/bindings/mfd/tc3589x.txt
index 6fcedba46ae9b8cebc4aa2b465ce91243e1680a2..37bf7f1aa70a23a310c6a00f4f5e864f48b7ebff 100644 (file)
--- a/Documentation/devicetree/bindings/mfd/tc3589x.txt
+++ b/Documentation/devicetree/bindings/mfd/tc3589x.txt
@@ -55,7 +55,7 @@ Optional nodes:
  - linux,keymap: the definition can be found in
    bindings/input/matrix-keymap.txt
  - linux,no-autorepeat: do no enable autorepeat feature.
- - linux,wakeup: use any event on keypad as wakeup event.
+ - wakeup-source: use any event on keypad as wakeup event.
 
 Example:
 
@@ -84,7 +84,6 @@ tc35893@44 {
                keypad,num-columns = <8>;
                keypad,num-rows = <8>;
                linux,no-autorepeat;
-               linux,wakeup;
                linux,keymap = <0x0301006b
                                0x04010066
                                0x06040072
@@ -103,5 +102,6 @@ tc35893@44 {
                                0x01030039
                                0x07060069
                                0x050500d9>;
+               wakeup-source;
        };
 };