Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: pmic8xxx-keypad - change name of wakeup property

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.

Acked-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

+7 -5
+1 -1
Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt
··· 33 33 Value type: <bool> 34 34 Definition: don't enable autorepeat feature. 35 35 36 - - linux,keypad-wakeup: 36 + - wakeup-source: 37 37 Usage: optional 38 38 Value type: <bool> 39 39 Definition: use any event on keypad as wakeup event.
+6 -4
drivers/input/keyboard/pmic8xxx-keypad.c
··· 507 507 */ 508 508 static int pmic8xxx_kp_probe(struct platform_device *pdev) 509 509 { 510 + struct device_node *np = pdev->dev.of_node; 510 511 unsigned int rows, cols; 511 512 bool repeat; 512 513 bool wakeup; ··· 525 524 return -EINVAL; 526 525 } 527 526 528 - repeat = !of_property_read_bool(pdev->dev.of_node, 529 - "linux,input-no-autorepeat"); 530 - wakeup = of_property_read_bool(pdev->dev.of_node, 531 - "linux,keypad-wakeup"); 527 + repeat = !of_property_read_bool(np, "linux,input-no-autorepeat"); 528 + 529 + wakeup = of_property_read_bool(np, "wakeup-source") || 530 + /* legacy name */ 531 + of_property_read_bool(np, "linux,keypad-wakeup"); 532 532 533 533 kp = devm_kzalloc(&pdev->dev, sizeof(*kp), GFP_KERNEL); 534 534 if (!kp)