Commit 9c17baaa authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson
Browse files

ARM: dts: qcom: 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>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220616005333.18491-25-krzysztof.kozlowski@linaro.org
parent 31b2edca

arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts

+2 −2
Original line number Diff line number Diff line
@@ -44,12 +44,12 @@ ext_3p3v: regulator-fixed@1 { 


	gpio-keys {

		compatible = "gpio-keys";

		volume_up {

		key-volume-up {

			label = "Volume Up";

			gpios = <&pm8921_gpio 4 GPIO_ACTIVE_HIGH>;

			linux,code = <KEY_VOLUMEUP>;

		};

		volume_down {

		key-volume-down {

			label = "Volume Down";

			gpios = <&pm8921_gpio 38 GPIO_ACTIVE_HIGH>;

			linux,code = <KEY_VOLUMEDOWN>;

arch/arm/boot/dts/qcom-apq8064-sony-xperia-lagan-yuga.dts

+4 −4
Original line number Diff line number Diff line
@@ -23,28 +23,28 @@ gpio-keys { 
		pinctrl-names = "default";

		pinctrl-0 = <&gpio_keys_pin_a>;



		camera-focus {

		key-camera-focus {

			label = "camera_focus";

			gpios = <&pm8921_gpio 3 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_CAMERA_FOCUS>;

		};



		camera-snapshot {

		key-camera-snapshot {

			label = "camera_snapshot";

			gpios = <&pm8921_gpio 4 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_CAMERA>;

		};



		volume-down {

		key-volume-down {

			label = "volume_down";

			gpios = <&pm8921_gpio 29 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

			linux,code = <KEY_VOLUMEDOWN>;

		};



		volume-up {

		key-volume-up {

			label = "volume_up";

			gpios = <&pm8921_gpio 35 GPIO_ACTIVE_LOW>;

			linux,input-type = <1>;

arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ / { 
	keys {

		compatible = "gpio-keys";



		reset {

		key-reset {

			label = "reset";

			gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_RESTART>;

arch/arm/boot/dts/qcom-ipq8064-rb3011.dts

+2 −2
Original line number Diff line number Diff line
@@ -187,12 +187,12 @@ partition@0 { 
			};

		};



		gpio_keys {

		gpio-keys {

			compatible = "gpio-keys";

			pinctrl-0 = <&buttons_pins>;

			pinctrl-names = "default";



			button@1 {

			button {

				label = "reset";

				linux,code = <KEY_RESTART>;

				gpios = <&qcom_pinmux 66 GPIO_ACTIVE_LOW>;

arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -65,19 +65,19 @@ sata@29000000 { 
			status = "okay";

		};



		gpio_keys {

		gpio-keys {

			compatible = "gpio-keys";

			pinctrl-0 = <&buttons_pins>;

			pinctrl-names = "default";



			button@1 {

			button-1 {

				label = "reset";

				linux,code = <KEY_RESTART>;

				gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;

				linux,input-type = <1>;

				debounce-interval = <60>;

			};

			button@2 {

			button-2 {

				label = "wps";

				linux,code = <KEY_WPS_BUTTON>;

				gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;