diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-16 12:03:39 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-23 15:01:22 -0700 |
| commit | abf77a32288d4379dfede0b50be6a04be3cd1431 (patch) | |
| tree | b5fc4dc6e64390c00e1fc3992d7d43f9b7add7c6 /drivers/input | |
| parent | aeda5003d0b987085acef6ad4844f8e34851bb10 (diff) | |
| download | linux-stable-abf77a32288d4379dfede0b50be6a04be3cd1431.tar.gz linux-stable-abf77a32288d4379dfede0b50be6a04be3cd1431.tar.bz2 linux-stable-abf77a32288d4379dfede0b50be6a04be3cd1431.zip | |
Input: ads7846 - 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.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/ads7846.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index e4eb8a6c658f..0f5f968592bd 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -1234,7 +1234,8 @@ static const struct ads7846_platform_data *ads7846_probe_dt(struct device *dev) of_property_read_u32(node, "ti,pendown-gpio-debounce", &pdata->gpio_pendown_debounce); - pdata->wakeup = of_property_read_bool(node, "linux,wakeup"); + pdata->wakeup = of_property_read_bool(node, "wakeup-source") || + of_property_read_bool(node, "linux,wakeup"); pdata->gpio_pendown = of_get_named_gpio(dev->of_node, "pendown-gpio", 0); |