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

Input: tc3589x-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.

Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 43b7be3b

Documentation/devicetree/bindings/mfd/tc3589x.txt

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ Optional nodes: 
 - linux,keymap: the definition can be found in

   bindings/input/matrix-keymap.txt

 - linux,no-autorepeat: do no enable autorepeat feature.

 - linux,wakeup: use any event on keypad as wakeup event.

 - wakeup-source: use any event on keypad as wakeup event.



Example:
@@ -84,7 +84,6 @@ tc35893@44 { 
		keypad,num-columns = <8>;

		keypad,num-rows = <8>;

		linux,no-autorepeat;

		linux,wakeup;

		linux,keymap = <0x0301006b

				0x04010066

				0x06040072
@@ -103,5 +102,6 @@ tc35893@44 { 
				0x01030039

				0x07060069

				0x050500d9>;

		wakeup-source;

	};

};

drivers/input/keyboard/tc3589x-keypad.c

+4 −1
Original line number Diff line number Diff line
@@ -352,7 +352,10 @@ tc3589x_keypad_of_probe(struct device *dev) 
	}



	plat->no_autorepeat = of_property_read_bool(np, "linux,no-autorepeat");

	plat->enable_wakeup = of_property_read_bool(np, "linux,wakeup");



	plat->enable_wakeup = of_property_read_bool(np, "wakeup-source") ||

			      /* legacy name */

			      of_property_read_bool(np, "linux,wakeup");



	/* The custom delay format is ms/16 */

	of_property_read_u32(np, "debounce-delay-ms", &debounce_ms);

CRA Git | Maintained and supported by SUSTech CRA and CCSE