Commit aeda5003 authored by Dmitry Torokhov's avatar Dmitry Torokhov

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: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 02b0b79c
...@@ -19,7 +19,7 @@ Required Properties: ...@@ -19,7 +19,7 @@ Required Properties:
Optional Properties: Optional Properties:
- linux,no-autorepeat: do no enable autorepeat feature. - 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.
- debounce-delay-ms: debounce interval in milliseconds - debounce-delay-ms: debounce interval in milliseconds
- col-scan-delay-us: delay, measured in microseconds, that is needed - col-scan-delay-us: delay, measured in microseconds, that is needed
before we can scan keypad after activating column gpio before we can scan keypad after activating column gpio
......
...@@ -425,8 +425,10 @@ matrix_keypad_parse_dt(struct device *dev) ...@@ -425,8 +425,10 @@ matrix_keypad_parse_dt(struct device *dev)
if (of_get_property(np, "linux,no-autorepeat", NULL)) if (of_get_property(np, "linux,no-autorepeat", NULL))
pdata->no_autorepeat = true; 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)) if (of_get_property(np, "gpio-activelow", NULL))
pdata->active_low = true; pdata->active_low = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment