Input: tc3589x-keypad - change name of wakeup property

Wakeup property of device is not Linux-specific, it describes intended
system behavior regardless of the OS being used. Therefore let's drop
"linux," prefix, and, while at it, use the same name as I2C bus does:
"wakeup-source".

We keep parsing old name to keep compatibility with old DTSes.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

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;
        };
 };

diff --git a/drivers/input/keyboard/tc3589x-keypad.c b/drivers/input/keyboard/tc3589x-keypad.c
index 31c606a4dd310cbfa0ccfdbfce39769f3e86beda..565805e1ff94d26529981215be286301f75c9410 100644 (file)
--- a/drivers/input/keyboard/tc3589x-keypad.c
+++ b/drivers/input/keyboard/tc3589x-keypad.c
@@ -352,7 +352,10 @@ tc3589x_keypad_of_probe(struct device *dev)
        }
 
        plat->no_autorepeat = of_property_read_bool(np, "linux,no-autorepeat");
-       plat->enable_wakeup = of_property_read_bool(np, "linux,wakeup");
+
+       plat->enable_wakeup = of_property_read_bool(np, "wakeup-source") ||
+                             /* legacy name */
+                             of_property_read_bool(np, "linux,wakeup");
 
        /* The custom delay format is ms/16 */
        of_property_read_u32(np, "debounce-delay-ms", &debounce_ms);