Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: matrix_keypad - change name of wakeup property to "wakeup-source"

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.

Cc: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

+5 -3
+1 -1
Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt
··· 19 19 20 20 Optional Properties: 21 21 - linux,no-autorepeat: do no enable autorepeat feature. 22 - - linux,wakeup: use any event on keypad as wakeup event. 22 + - wakeup-source: use any event on keypad as wakeup event. 23 23 - debounce-delay-ms: debounce interval in milliseconds 24 24 - col-scan-delay-us: delay, measured in microseconds, that is needed 25 25 before we can scan keypad after activating column gpio
+4 -2
drivers/input/keyboard/matrix_keypad.c
··· 425 425 426 426 if (of_get_property(np, "linux,no-autorepeat", NULL)) 427 427 pdata->no_autorepeat = true; 428 - if (of_get_property(np, "linux,wakeup", NULL)) 429 - pdata->wakeup = true; 428 + 429 + pdata->wakeup = of_property_read_bool(np, "wakeup-source") || 430 + of_property_read_bool(np, "linux,wakeup"); /* legacy */ 431 + 430 432 if (of_get_property(np, "gpio-activelow", NULL)) 431 433 pdata->active_low = true; 432 434