p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Input: samsung-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.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Dmitry Torokhov 2015-07-17 17:04:10 -07:00
parent 99b4ffbd84
commit 43b7be3b8c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/devicetree/bindings/input/samsung-keypad.txt
View File

@ -36,9 +36,11 @@ Required Board Specific Properties:
- pinctrl-0: Should specify pin control groups used for this controller. - pinctrl-0: Should specify pin control groups used for this controller.
- pinctrl-names: Should contain only one value - "default". - pinctrl-names: Should contain only one value - "default".
Optional Properties:
- wakeup-source: use any event on keypad as wakeup event.
Optional Properties specific to linux: Optional Properties specific to linux:
- linux,keypad-no-autorepeat: do no enable autorepeat feature. - linux,keypad-no-autorepeat: do no enable autorepeat feature.
- linux,keypad-wakeup: use any event on keypad as wakeup event.
Example: Example:

6
drivers/input/keyboard/samsung-keypad.c
View File

@ -299,8 +299,10 @@ samsung_keypad_parse_dt(struct device *dev)
if (of_get_property(np, "linux,input-no-autorepeat", NULL)) if (of_get_property(np, "linux,input-no-autorepeat", NULL))
pdata->no_autorepeat = true; pdata->no_autorepeat = true;
if (of_get_property(np, "linux,input-wakeup", NULL)) pdata->wakeup = of_property_read_bool(np, "wakeup-source") ||
pdata->wakeup = true; /* legacy name */
of_property_read_bool(np, "linux,input-wakeup");
return pdata; return pdata;
} }