Commit b1c9af5f authored Jun 15, 2022 by Krzysztof Kozlowski

ARM: dts: omap: 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: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220616005333.18491-32-krzysztof.kozlowski@linaro.org

parent 8b0848f5

arch/arm/boot/dts/am335x-evm.dts

+3 −3

Original line number	Diff line number	Diff line
		@@ -92,20 +92,20 @@ &gpio1 26 GPIO_ACTIVE_HIGH /* Bank1, pin26 */
		0x0201006c>; /* DOWN */
		};

		gpio_keys: volume_keys0 {
		gpio_keys: volume-keys {
		compatible = "gpio-keys";
		#address-cells = <1>;
		#size-cells = <0>;
		autorepeat;

		switch9 {
		switch-9 {
		label = "volume-up";
		linux,code = <115>;
		gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
		wakeup-source;
		};

		switch10 {
		switch-10 {
		label = "volume-down";
		linux,code = <114>;
		gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/am335x-shc.dts

+3 −3

Original line number	Diff line number	Diff line
		@@ -36,10 +36,10 @@ cpu@0 {
		};
		};

		gpio_keys {
		gpio-keys {
		compatible = "gpio-keys";

		back_button {
		back-button {
		label = "Back Button";
		gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;
		linux,code = <KEY_BACK>;
		@@ -47,7 +47,7 @@ back_button {
		wakeup-source;
		};

		front_button {
		front-button {
		label = "Front Button";
		gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;
		linux,code = <KEY_FRONT>;

arch/arm/boot/dts/am3517-evm-ui.dtsi

+10 −10

Original line number	Diff line number	Diff line
		@@ -70,61 +70,61 @@ expander-keys {
		compatible = "gpio-keys-polled";
		poll-interval = <100>;

		record {
		key-record {
		label = "Record";
		/* linux,code = <BTN_0>; */
		gpios = <&tca6416_2 15 GPIO_ACTIVE_LOW>;
		};

		play {
		key-play {
		label = "Play";
		linux,code = <KEY_PLAY>;
		gpios = <&tca6416_2 14 GPIO_ACTIVE_LOW>;
		};

		Stop {
		key-stop {
		label = "Stop";
		linux,code = <KEY_STOP>;
		gpios = <&tca6416_2 13 GPIO_ACTIVE_LOW>;
		};

		fwd {
		key-fwd {
		label = "FWD";
		linux,code = <KEY_FASTFORWARD>;
		gpios = <&tca6416_2 12 GPIO_ACTIVE_LOW>;
		};

		rwd {
		key-rwd {
		label = "RWD";
		linux,code = <KEY_REWIND>;
		gpios = <&tca6416_2 11 GPIO_ACTIVE_LOW>;
		};

		shift {
		key-shift {
		label = "Shift";
		linux,code = <KEY_LEFTSHIFT>;
		gpios = <&tca6416_2 10 GPIO_ACTIVE_LOW>;
		};

		Mode {
		key-mode {
		label = "Mode";
		linux,code = <BTN_MODE>;
		gpios = <&tca6416_2 9 GPIO_ACTIVE_LOW>;
		};

		Menu {
		key-menu {
		label = "Menu";
		linux,code = <KEY_MENU>;
		gpios = <&tca6416_2 8 GPIO_ACTIVE_LOW>;
		};

		Up {
		key-up {
		label = "Up";
		linux,code = <KEY_UP>;
		gpios = <&tca6416_2 7 GPIO_ACTIVE_LOW>;
		};

		Down {
		key-down {
		label = "Down";
		linux,code = <KEY_DOWN>;
		gpios = <&tca6416_2 6 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/am3517-evm.dts

+9 −9

Original line number	Diff line number	Diff line
		@@ -37,55 +37,55 @@ gpio-keys {
		compatible = "gpio-keys-polled";
		poll-interval = <100>;

		user_pb {
		button-user {
		label = "User Push Button";
		linux,code = <BTN_0>;
		gpios = <&tca6416 5 GPIO_ACTIVE_LOW>;
		};

		user_sw_1 {
		switch-1 {
		label = "User Switch 1";
		linux,code = <BTN_1>;
		gpios = <&tca6416 8 GPIO_ACTIVE_LOW>;
		};

		user_sw_2 {
		switch-2 {
		label = "User Switch 2";
		linux,code = <BTN_2>;
		gpios = <&tca6416 9 GPIO_ACTIVE_LOW>;
		};

		user_sw_3 {
		switch-3 {
		label = "User Switch 3";
		linux,code = <BTN_3>;
		gpios = <&tca6416 10 GPIO_ACTIVE_LOW>;
		};

		user_sw_4 {
		switch-4 {
		label = "User Switch 4";
		linux,code = <BTN_4>;
		gpios = <&tca6416 11 GPIO_ACTIVE_LOW>;
		};

		user_sw_5 {
		switch-5 {
		label = "User Switch 5";
		linux,code = <BTN_5>;
		gpios = <&tca6416 12 GPIO_ACTIVE_LOW>;
		};

		user_sw_6 {
		switch-6 {
		label = "User Switch 6";
		linux,code = <BTN_6>;
		gpios = <&tca6416 13 GPIO_ACTIVE_LOW>;
		};

		user_sw_7 {
		switch-7 {
		label = "User Switch 7";
		linux,code = <BTN_7>;
		gpios = <&tca6416 14 GPIO_ACTIVE_LOW>;
		};

		user_sw_8 {
		switch-8 {
		label = "User Switch 8";
		linux,code = <BTN_8>;
		gpios = <&tca6416 15 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/am437x-idk-evm.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ v1_5d: fixed-regulator-v1_5d{
		vin-supply = <&v1_5dreg>;
		};

		gpio_keys: gpio_keys {
		gpio_keys: gpio-keys {
		compatible = "gpio-keys";
		pinctrl-names = "default";
		pinctrl-0 = <&gpio_keys_pins_default>;