Commit 517ed0ff authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Heiko Stuebner
Browse files

arm64: dts: rockchip: 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>
Link: https://lore.kernel.org/r/20220616005333.18491-26-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent bc3753ae

arch/arm64/boot/dts/rockchip/rk3308-evb.dts

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ gpio-keys { 
		pinctrl-names = "default";

		pinctrl-0 = <&pwr_key>;



		power {

		key-power {

			gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			label = "GPIO Key Power";

arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts

+16 −16
Original line number Diff line number Diff line
@@ -71,82 +71,82 @@ gpio-keys { 
		 * |------------------------------------------------|

		 */



		sw1 {

		button-sw1 {

			gpios = <&gpio1 RK_PB4 GPIO_ACTIVE_LOW>;

			label = "DPAD-UP";

			linux,code = <BTN_DPAD_UP>;

		};

		sw2 {

		button-sw2 {

			gpios = <&gpio1 RK_PB5 GPIO_ACTIVE_LOW>;

			label = "DPAD-DOWN";

			linux,code = <BTN_DPAD_DOWN>;

		};

		sw3 {

		button-sw3 {

			gpios = <&gpio1 RK_PB6 GPIO_ACTIVE_LOW>;

			label = "DPAD-LEFT";

			linux,code = <BTN_DPAD_LEFT>;

		};

		sw4 {

		button-sw4 {

			gpios = <&gpio1 RK_PB7 GPIO_ACTIVE_LOW>;

			label = "DPAD-RIGHT";

			linux,code = <BTN_DPAD_RIGHT>;

		};

		sw5 {

		button-sw5 {

			gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_LOW>;

			label = "BTN-A";

			linux,code = <BTN_EAST>;

		};

		sw6 {

		button-sw6 {

			gpios = <&gpio1 RK_PA5 GPIO_ACTIVE_LOW>;

			label = "BTN-B";

			linux,code = <BTN_SOUTH>;

		};

		sw7 {

		button-sw7 {

			gpios = <&gpio1 RK_PA6 GPIO_ACTIVE_LOW>;

			label = "BTN-Y";

			linux,code = <BTN_WEST>;

		};

		sw8 {

		button-sw8 {

			gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_LOW>;

			label = "BTN-X";

			linux,code = <BTN_NORTH>;

		};

		sw9 {

		button-sw9 {

			gpios = <&gpio2 RK_PA0 GPIO_ACTIVE_LOW>;

			label = "F1";

			linux,code = <BTN_TRIGGER_HAPPY1>;

		};

		sw10 {

		button-sw10 {

			gpios = <&gpio2 RK_PA1 GPIO_ACTIVE_LOW>;

			label = "F2";

			linux,code = <BTN_TRIGGER_HAPPY2>;

		};

		sw11 {

		button-sw11 {

			gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>;

			label = "F3";

			linux,code = <BTN_TRIGGER_HAPPY3>;

		};

		sw12 {

		button-sw12 {

			gpios = <&gpio2 RK_PA3 GPIO_ACTIVE_LOW>;

			label = "F4";

			linux,code = <BTN_TRIGGER_HAPPY4>;

		};

		sw13 {

		button-sw13 {

			gpios = <&gpio2 RK_PA4 GPIO_ACTIVE_LOW>;

			label = "F5";

			linux,code = <BTN_TRIGGER_HAPPY5>;

		};

		sw14 {

		button-sw14 {

			gpios = <&gpio2 RK_PA5 GPIO_ACTIVE_LOW>;

			label = "F6";

			linux,code = <BTN_TRIGGER_HAPPY6>;

		};

		sw15 {

		button-sw15 {

			gpios = <&gpio2 RK_PA6 GPIO_ACTIVE_LOW>;

			label = "TOP-LEFT";

			linux,code = <BTN_TL>;

		};

		sw16 {

		button-sw16 {

			gpios = <&gpio2 RK_PA7 GPIO_ACTIVE_LOW>;

			label = "TOP-RIGHT";

			linux,code = <BTN_TR>;

arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ keys { 
		pinctrl-0 = <&reset_button_pin>;

		pinctrl-names = "default";



		reset {

		key-reset {

			label = "reset";

			gpios = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_RESTART>;

arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ keys: gpio-keys { 
		pinctrl-names = "default";

		pinctrl-0 = <&pwr_key>;



		power {

		key-power {

			wakeup-source;

			gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;

			label = "GPIO Power";

arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ keys: gpio-keys { 
		pinctrl-names = "default";

		pinctrl-0 = <&pwr_key>;



		power {

		key-power {

			gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;

			label = "GPIO Power";

			linux,code = <KEY_POWER>;