Commit 393421f1 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Jernej Skrabec
Browse files

ARM: dts: allwinner: align gpio-key node names with dtschema 



The node names should be generic and DT schema expects certain pattern
(e.g. with key/button/switch).

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Link: https://lore.kernel.org/r/20220609113911.380368-5-krzysztof.kozlowski@linaro.org
parent a0bdaf59

arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts

+20 −20
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ gpio-keys { 
		compatible = "gpio-keys-polled";

		poll-interval = <20>;



		left-joystick-left {

		event-left-joystick-left {

			label = "Left Joystick Left";

			linux,code = <ABS_X>;

			linux,input-type = <EV_ABS>;
@@ -71,7 +71,7 @@ left-joystick-left { 
			gpios = <&pio 0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA6 */

		};



		left-joystick-right {

		event-left-joystick-right {

			label = "Left Joystick Right";

			linux,code = <ABS_X>;

			linux,input-type = <EV_ABS>;
@@ -79,7 +79,7 @@ left-joystick-right { 
			gpios = <&pio 0 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA5 */

		};



		left-joystick-up {

		event-left-joystick-up {

			label = "Left Joystick Up";

			linux,code = <ABS_Y>;

			linux,input-type = <EV_ABS>;
@@ -87,7 +87,7 @@ left-joystick-up { 
			gpios = <&pio 0 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA8 */

		};



		left-joystick-down {

		event-left-joystick-down {

			label = "Left Joystick Down";

			linux,code = <ABS_Y>;

			linux,input-type = <EV_ABS>;
@@ -95,7 +95,7 @@ left-joystick-down { 
			gpios = <&pio 0 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA9 */

		};



		right-joystick-left {

		event-right-joystick-left {

			label = "Right Joystick Left";

			linux,code = <ABS_Z>;

			linux,input-type = <EV_ABS>;
@@ -103,7 +103,7 @@ right-joystick-left { 
			gpios = <&pio 0 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA1 */

		};



		right-joystick-right {

		event-right-joystick-right {

			label = "Right Joystick Right";

			linux,code = <ABS_Z>;

			linux,input-type = <EV_ABS>;
@@ -111,7 +111,7 @@ right-joystick-right { 
			gpios = <&pio 0 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA0 */

		};



		right-joystick-up {

		event-right-joystick-up {

			label = "Right Joystick Up";

			linux,code = <ABS_RZ>;

			linux,input-type = <EV_ABS>;
@@ -119,7 +119,7 @@ right-joystick-up { 
			gpios = <&pio 0 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA3 */

		};



		right-joystick-down {

		event-right-joystick-down {

			label = "Right Joystick Down";

			linux,code = <ABS_RZ>;

			linux,input-type = <EV_ABS>;
@@ -127,7 +127,7 @@ right-joystick-down { 
			gpios = <&pio 0 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA4 */

		};



		dpad-left {

		event-dpad-left {

			label = "DPad Left";

			linux,code = <ABS_HAT0X>;

			linux,input-type = <EV_ABS>;
@@ -135,7 +135,7 @@ dpad-left { 
			gpios = <&pio 7 23 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH23 */

		};



		dpad-right {

		event-dpad-right {

			label = "DPad Right";

			linux,code = <ABS_HAT0X>;

			linux,input-type = <EV_ABS>;
@@ -143,7 +143,7 @@ dpad-right { 
			gpios = <&pio 7 24 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH24 */

		};



		dpad-up {

		event-dpad-up {

			label = "DPad Up";

			linux,code = <ABS_HAT0Y>;

			linux,input-type = <EV_ABS>;
@@ -151,7 +151,7 @@ dpad-up { 
			gpios = <&pio 7 25 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH25 */

		};



		dpad-down {

		event-dpad-down {

			label = "DPad Down";

			linux,code = <ABS_HAT0Y>;

			linux,input-type = <EV_ABS>;
@@ -159,49 +159,49 @@ dpad-down { 
			gpios = <&pio 7 26 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH26 */

		};



		x {

		event-x {

			label = "Button X";

			linux,code = <BTN_X>;

			gpios = <&pio 0 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA16 */

		};



		y {

		event-y {

			label = "Button Y";

			linux,code = <BTN_Y>;

			gpios = <&pio 0 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA14 */

		};



		a {

		event-a {

			label = "Button A";

			linux,code = <BTN_A>;

			gpios = <&pio 0 17 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA17 */

		};



		b {

		event-b {

			label = "Button B";

			linux,code = <BTN_B>;

			gpios = <&pio 0 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA15 */

		};



		select {

		event-select {

			label = "Select Button";

			linux,code = <BTN_SELECT>;

			gpios = <&pio 0 11 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA11 */

		};



		start {

		event-start {

			label = "Start Button";

			linux,code = <BTN_START>;

			gpios = <&pio 0 12 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA12 */

		};



		top-left {

		event-top-left {

			label = "Top Left Button";

			linux,code = <BTN_TL>;

			gpios = <&pio 7 22 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH22 */

		};



		top-right {

		event-top-right {

			label = "Top Right Button";

			linux,code = <BTN_TR>;

			gpios = <&pio 0 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA13 */

arch/arm/boot/dts/sun4i-a10-pcduino.dts

+3 −3
Original line number Diff line number Diff line
@@ -77,19 +77,19 @@ led-1 { 
	gpio-keys {

		compatible = "gpio-keys";



		back {

		key-back {

			label = "Key Back";

			linux,code = <KEY_BACK>;

			gpios = <&pio 7 17 GPIO_ACTIVE_LOW>;

		};



		home {

		key-home {

			label = "Key Home";

			linux,code = <KEY_HOME>;

			gpios = <&pio 7 18 GPIO_ACTIVE_LOW>;

		};



		menu {

		key-menu {

			label = "Key Menu";

			linux,code = <KEY_MENU>;

			gpios = <&pio 7 19 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/sun7i-a20-pcduino3.dts

+3 −3
Original line number Diff line number Diff line
@@ -78,19 +78,19 @@ led-1 { 
	gpio-keys {

		compatible = "gpio-keys";



		back {

		key-back {

			label = "Key Back";

			linux,code = <KEY_BACK>;

			gpios = <&pio 7 17 GPIO_ACTIVE_LOW>;

		};



		home {

		key-home {

			label = "Key Home";

			linux,code = <KEY_HOME>;

			gpios = <&pio 7 18 GPIO_ACTIVE_LOW>;

		};



		menu {

		key-menu {

			label = "Key Menu";

			linux,code = <KEY_MENU>;

			gpios = <&pio 7 19 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts

+2 −2
Original line number Diff line number Diff line
@@ -47,10 +47,10 @@ pwr_led { 
		};

	};



	gpio_keys {

	gpio-keys {

		compatible = "gpio-keys";



		sw4 {

		switch-4 {

			label = "power";

			linux,code = <KEY_POWER>;

			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/sun8i-h3-beelink-x2.dts

+2 −2
Original line number Diff line number Diff line
@@ -93,10 +93,10 @@ led-1 { 
		};

	};



	r-gpio-keys {

	gpio-keys {

		compatible = "gpio-keys";



		power {

		key-power {

			label = "power";

			linux,code = <KEY_POWER>;

			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;