Input: gpio_keys[_polled] - 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/input/gpio-keys-polled.txt b/Documentation/devicetree/bindings/input/gpio-keys-polled.txt
index 313abef..5b91f5a 100644 (file)
--- a/Documentation/devicetree/bindings/input/gpio-keys-polled.txt
+++ b/Documentation/devicetree/bindings/input/gpio-keys-polled.txt
@@ -20,7 +20,7 @@ Optional subnode-properties:
          If not specified defaults to <1> == EV_KEY.
        - debounce-interval: Debouncing interval time in milliseconds.
          If not specified defaults to 5.
-       - gpio-key,wakeup: Boolean, button can wake-up the system.
+       - wakeup-source: Boolean, button can wake-up the system.
 
 Example nodes:
 

diff --cc Documentation/devicetree/bindings/input/gpio-keys.txt
Simple merge

diff --cc drivers/input/keyboard/gpio_keys.c
Simple merge

diff --cc drivers/input/keyboard/gpio_keys_polled.c
Simple merge