These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / input / keyboard / matrix_keypad.c

diff --git a/kernel/drivers/input/keyboard/matrix_keypad.c b/kernel/drivers/input/keyboard/matrix_keypad.c
index b370a59..7f12b65 100644 (file)
--- a/kernel/drivers/input/keyboard/matrix_keypad.c
+++ b/kernel/drivers/input/keyboard/matrix_keypad.c
@@ -425,8 +425,10 @@ matrix_keypad_parse_dt(struct device *dev)
 
        if (of_get_property(np, "linux,no-autorepeat", NULL))
                pdata->no_autorepeat = true;
-       if (of_get_property(np, "linux,wakeup", NULL))
-               pdata->wakeup = true;
+
+       pdata->wakeup = of_property_read_bool(np, "wakeup-source") ||
+                       of_property_read_bool(np, "linux,wakeup"); /* legacy */
+
        if (of_get_property(np, "gpio-activelow", NULL))
                pdata->active_low = true;