These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / input / keyboard / samsung-keypad.c

diff --git a/kernel/drivers/input/keyboard/samsung-keypad.c b/kernel/drivers/input/keyboard/samsung-keypad.c
index 6b9fdf6..4e319eb 100644 (file)
--- a/kernel/drivers/input/keyboard/samsung-keypad.c
+++ b/kernel/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;
 }
@@ -585,7 +587,7 @@ static const struct of_device_id samsung_keypad_dt_match[] = {
 MODULE_DEVICE_TABLE(of, samsung_keypad_dt_match);
 #endif
 
-static struct platform_device_id samsung_keypad_driver_ids[] = {
+static const struct platform_device_id samsung_keypad_driver_ids[] = {
        {
                .name           = "samsung-keypad",
                .driver_data    = KEYPAD_TYPE_SAMSUNG,