ipq806x: dts: Unify naming of gpio-keys nodes

In DTS Checklist[1] we're now demanding proper generic node names, as
the name of a node should reflect the function of the device and use
generic name for that[2]. Everybody seems to be copy&pasting from DTS
files available in the repository today, so let's unify that naming
there as well and provide proper examples.

1. https://openwrt.org/submitting-patches#dts_checklist
2. https://github.com/devicetree-org/devicetree-specification/blob/master/source/devicetree-basics.rst#generic-names-recommendation

Signed-off-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com> [split up]

diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
index 0db451958b02ff47e6f0e43e13170ea49d9c4f85..6d260dc61a826299e1a5b89d812280be6a3690de 100644 (file)
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
+++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-c2600.dts
@@ -410,7 +410,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
                pinctrl-names = "default";

diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
index 14ed6fb2f8a01749bb042c7b49ac222a7cd92276..d6678c7aeafd813683def0b8a0c55cbcb2226303 100644 (file)
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
+++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-d7800.dts
@@ -326,7 +326,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
                pinctrl-names = "default";

diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
index 900d602ede4921ffdb9274bda3fc2568cc1b7f18..929c447c705f8e2b743eb087f5c8319f55c5ad05 100644 (file)
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
+++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-ea8500.dts
@@ -361,7 +361,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
                pinctrl-names = "default";

diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
index 5a3056807a09e0863d3e4c4cd3cea2892b4a1d9f..8966a6db424bb52b8dd256016d19d601d6354b81 100644 (file)
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
@@ -295,7 +295,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
                pinctrl-names = "default";

diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
index 1005ea137af2aca836d8395b4bd5f68165e08787..563fb6f883576ac567d5882476bfa77b25942484 100644 (file)
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
+++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts
@@ -331,7 +331,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
                pinctrl-names = "default";

diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
index 56421b25e62de018cfaf7dc2684b9202a111244d..c31e37b113b1419cb19cab7d0a5a634995981fd3 100644 (file)
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
+++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts
@@ -323,7 +323,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
                pinctrl-names = "default";

diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
index 881b542203266a6acb7b5c76fb04bdba0700583f..4d7a044f1451f53e2407a87ec01be1763f64c533 100644 (file)
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
+++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts
@@ -62,7 +62,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
                pinctrl-names = "default";

diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
index 591f3539f59445467c14628fad8e60456a39a7f5..1080c6fd51c932a5d880789a30735b64ee135fcd 100644 (file)
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
+++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
@@ -294,7 +294,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                pinctrl-0 = <&button_pins>;

diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
index dd06fccd1e2d0d0956ee3ba8023bfbe4afaa1357..96f2f24b40751cba4f58997c73f131c4da0444ed 100644 (file)
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
+++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
@@ -324,7 +324,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
                pinctrl-names = "default";

diff --git a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
index c4c9287942dd614fcd5c5f0c0d13d97fbd81fc3d..256057a755bd1b061b6953320e0384e71efe41c0 100644 (file)
--- a/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
+++ b/target/linux/ipq806x/files-4.14/arch/arm/boot/dts/qcom-ipq8065-r7800.dts
@@ -424,7 +424,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
                pinctrl-0 = <&button_pins>;
                pinctrl-names = "default";