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

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

diff --git a/kernel/drivers/input/keyboard/pmic8xxx-keypad.c b/kernel/drivers/input/keyboard/pmic8xxx-keypad.c
index 32580af..5c68e3f 100644 (file)
--- a/kernel/drivers/input/keyboard/pmic8xxx-keypad.c
+++ b/kernel/drivers/input/keyboard/pmic8xxx-keypad.c
@@ -507,6 +507,7 @@ static void pmic8xxx_kp_close(struct input_dev *dev)
  */
 static int pmic8xxx_kp_probe(struct platform_device *pdev)
 {
+       struct device_node *np = pdev->dev.of_node;
        unsigned int rows, cols;
        bool repeat;
        bool wakeup;
@@ -524,10 +525,11 @@ static int pmic8xxx_kp_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       repeat = !of_property_read_bool(pdev->dev.of_node,
-                                       "linux,input-no-autorepeat");
-       wakeup = of_property_read_bool(pdev->dev.of_node,
-                                       "linux,keypad-wakeup");
+       repeat = !of_property_read_bool(np, "linux,input-no-autorepeat");
+
+       wakeup = of_property_read_bool(np, "wakeup-source") ||
+                /* legacy name */
+                of_property_read_bool(np, "linux,keypad-wakeup");
 
        kp = devm_kzalloc(&pdev->dev, sizeof(*kp), GFP_KERNEL);
        if (!kp)