]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/input/keyboard/gpio_keys_polled.c
Merge tag 'vmwgfx-fixes-4.3-151014' of git://people.freedesktop.org/~thomash/linux...
[karo-tx-linux.git] / drivers / input / keyboard / gpio_keys_polled.c
index c6dc644aa5806b37cb4e0dcbbc6217d915e8a562..870cfa6e2c44ed6791782401bb098096c4d052f4 100644 (file)
@@ -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))