Commit 27469652 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

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: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent abf77a32

Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ PROPERTIES 
	Value type: <bool>

	Definition: don't enable autorepeat feature.



- linux,keypad-wakeup:

- wakeup-source:

	Usage: optional

	Value type: <bool>

	Definition: use any event on keypad as wakeup event.

drivers/input/keyboard/pmic8xxx-keypad.c

+6 −4
Original line number Diff line number Diff line
@@ -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)