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: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220616005333.18491-25-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
index beb2058fd116061b37ea2e5c6a3e9436ecb1f5fd..799cd0f8de401487b67145f1c79c2e6d9452ba9f 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
@@ -44,12 +44,12 @@
 
        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>;

diff --git a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-lagan-yuga.dts b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-lagan-yuga.dts
index 3cf79cc5b53931719a65406dcb6244288600aa05..c07c5474750d3f87c94ef2c8103ad118e5d780ae 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064-sony-xperia-lagan-yuga.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-sony-xperia-lagan-yuga.dts
@@ -23,28 +23,28 @@
                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>;

diff --git a/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi b/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi
index 1f3b1ce82108839e2becd978d098fc88efdb852f..af9a26fb5d4a163839f225ef69da41a9daa25a13 100644 (file)
--- a/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4018-ap120c-ac.dtsi
@@ -11,7 +11,7 @@
        keys {
                compatible = "gpio-keys";
 
-               reset {
+               key-reset {
                        label = "reset";
                        gpios = <&tlmm 63 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;

diff --git a/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts b/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
index 596d129d4a953a05efbdb51dda293b642fb373a5..760151b52add53acf4c78e9e46808ca42f684642 100644 (file)
--- a/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
+++ b/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
@@ -187,12 +187,12 @@
                        };
                };
 
-               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>;

diff --git a/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi b/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
index 5c802b99e15fb13359bc472967c7f92afaa06873..ccebb7d56113ffbc5d70e5a4a64865b09aca7b7c 100644 (file)
--- a/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
@@ -65,19 +65,19 @@
                        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>;

diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
index 4d8fc8689d24706a4f69366767c1cb82a1109ab3..b994474f83e6e6bc117230b763e2e8523b4d0d6a 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
@@ -24,14 +24,14 @@
                pinctrl-names = "default";
                pinctrl-0 = <&gpio_keys_pin_a>;
 
-               volume-up {
+               key-volume-up {
                        label = "volume_up";
                        gpios = <&pm8941_gpios 2 GPIO_ACTIVE_LOW>;
                        linux,input-type = <1>;
                        linux,code = <KEY_VOLUMEUP>;
                };
 
-               volume-down {
+               key-volume-down {
                        label = "volume_down";
                        gpios = <&pm8941_gpios 3 GPIO_ACTIVE_LOW>;
                        linux,input-type = <1>;

diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
index a4fec2d0d1583ff4c02d95c507011099c15605e4..d42b85bda33ac88ae72d3bdb4c0752915c23ea70 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi
@@ -20,28 +20,28 @@
                pinctrl-names = "default";
                pinctrl-0 = <&gpio_keys_pin_a>;
 
-               volume-down {
+               key-volume-down {
                        label = "volume_down";
                        gpios = <&pm8941_gpios 2 GPIO_ACTIVE_LOW>;
                        linux,input-type = <1>;
                        linux,code = <KEY_VOLUMEDOWN>;
                };
 
-               camera-snapshot {
+               key-camera-snapshot {
                        label = "camera_snapshot";
                        gpios = <&pm8941_gpios 3 GPIO_ACTIVE_LOW>;
                        linux,input-type = <1>;
                        linux,code = <KEY_CAMERA>;
                };
 
-               camera-focus {
+               key-camera-focus {
                        label = "camera_focus";
                        gpios = <&pm8941_gpios 4 GPIO_ACTIVE_LOW>;
                        linux,input-type = <1>;
                        linux,code = <KEY_CAMERA_FOCUS>;
                };
 
-               volume-up {
+               key-volume-up {
                        label = "volume_up";
                        gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>;
                        linux,input-type = <1>;

diff --git a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
index 21d2c55c04655ed3f6a450d331d9b61f513777b2..e1ae9957959648dee2420a63382cc10d3e807310 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-fairphone-fp2.dts
@@ -25,7 +25,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&gpio_keys_pin_a>;
 
-               camera-snapshot {
+               key-camera-snapshot {
                        label = "camera_snapshot";
                        gpios = <&pm8941_gpios 1 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_CAMERA>;
@@ -33,7 +33,7 @@
                        debounce-interval = <15>;
                };
 
-               volume-down {
+               key-volume-down {
                        label = "volume_down";
                        gpios = <&pm8941_gpios 2 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEDOWN>;
@@ -41,7 +41,7 @@
                        debounce-interval = <15>;
                };
 
-               volume-up {
+               key-volume-up {
                        label = "volume_up";
                        gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_VOLUMEUP>;

diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
index 90f7a399f40bf4be14f25667957d64d1b1d319bb..aa609312caf9b711957c007d1e15a4d4b76318d1 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
@@ -25,7 +25,7 @@
                pinctrl-names = "default";
                pinctrl-0 = <&gpio_keys_pin_a>;
 
-               volume-down {
+               key-volume-down {
                        label = "volume_down";
                        gpios = <&pma8084_gpios 2 GPIO_ACTIVE_LOW>;
                        linux,input-type = <1>;
@@ -33,7 +33,7 @@
                        debounce-interval = <15>;
                };
 
-               home-key {
+               key-home {
                        label = "home_key";
                        gpios = <&pma8084_gpios 3 GPIO_ACTIVE_LOW>;
                        linux,input-type = <1>;
@@ -42,7 +42,7 @@
                        debounce-interval = <15>;
                };
 
-               volume-up {
+               key-volume-up {
                        label = "volume_up";
                        gpios = <&pma8084_gpios 5 GPIO_ACTIVE_LOW>;
                        linux,input-type = <1>;

diff --git a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
index e9bcd3b4ebb3abc8a48f921d28b5d58091ba212f..9fc696a7399acc5ed4e55c3df39b47fed95a639e 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-sony-xperia-shinano-castor.dts
@@ -24,28 +24,28 @@
                pinctrl-names = "default";
                pinctrl-0 = <&gpio_keys_pin_a>;
 
-               volume-down {
+               key-volume-down {
                        label = "volume_down";
                        gpios = <&pm8941_gpios 2 GPIO_ACTIVE_LOW>;
                        linux,input-type = <1>;
                        linux,code = <KEY_VOLUMEDOWN>;
                };
 
-               camera-snapshot {
+               key-camera-snapshot {
                        label = "camera_snapshot";
                        gpios = <&pm8941_gpios 3 GPIO_ACTIVE_LOW>;
                        linux,input-type = <1>;
                        linux,code = <KEY_CAMERA>;
                };
 
-               camera-focus {
+               key-camera-focus {
                        label = "camera_focus";
                        gpios = <&pm8941_gpios 4 GPIO_ACTIVE_LOW>;
                        linux,input-type = <1>;
                        linux,code = <KEY_CAMERA_FOCUS>;
                };
 
-               volume-up {
+               key-volume-up {
                        label = "volume_up";
                        gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>;
                        linux,input-type = <1>;