Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/bcm2835', 'spi/fix/doc'...

[karo-tx-linux.git] / drivers / input / keyboard / samsung-keypad.c

diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
index 43e48dac7687f293bacf3a83831ec28127b97307..4e319eb9e19d9f75a67d7c2123cc3bf5550c86ad 100644 (file)
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@ -299,8 +299,10 @@ samsung_keypad_parse_dt(struct device *dev)
        if (of_get_property(np, "linux,input-no-autorepeat", NULL))
                pdata->no_autorepeat = true;
 
-       if (of_get_property(np, "linux,input-wakeup", NULL))
-               pdata->wakeup = true;
+       pdata->wakeup = of_property_read_bool(np, "wakeup-source") ||
+                       /* legacy name */
+                       of_property_read_bool(np, "linux,input-wakeup");
+
 
        return pdata;
 }