diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-16 12:10:05 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-23 15:01:23 -0700 |
| commit | 99b4ffbd84ea4191e0b8d1709230656a1c33b848 (patch) | |
| tree | d362d21704745ecb2f676b9a2a3e47f101c1fb47 /drivers/input/keyboard/gpio_keys_polled.c | |
| parent | Input: pmic8xxx-keypad - change name of wakeup property (diff) | |
| download | linux-dev-99b4ffbd84ea4191e0b8d1709230656a1c33b848.tar.xz linux-dev-99b4ffbd84ea4191e0b8d1709230656a1c33b848.zip | |
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>
Diffstat (limited to 'drivers/input/keyboard/gpio_keys_polled.c')
| -rw-r--r-- | drivers/input/keyboard/gpio_keys_polled.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c index 097d7216d98e..5a0c99950659 100644 --- a/drivers/input/keyboard/gpio_keys_polled.c +++ b/drivers/input/keyboard/gpio_keys_polled.c @@ -152,7 +152,10 @@ static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct &button->type)) button->type = EV_KEY; - button->wakeup = fwnode_property_present(child, "gpio-key,wakeup"); + button->wakeup = + fwnode_property_read_bool(child, "wakeup-source") || + /* legacy name */ + fwnode_property_read_bool(child, "gpio-key,wakeup"); if (fwnode_property_read_u32(child, "debounce-interval", &button->debounce_interval)) |