ipq40xx: 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/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-a42.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-a42.dts
index ed81cbc9b5ecdfae52ca34cd01db5595598d650e..e9be642a86c56a1c063d4017a568651db9aaa18c 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-a42.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-a42.dts
@@ -80,7 +80,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                reset {

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
index a86e34229e62b07bf754af2779c04710e2e32143..0314fa2e963e00f463d958042b1d4504303a9f44 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
@@ -53,7 +53,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                reset {

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
index ceece0f95682cf9876995355164829764a14863e..4565652c09a3b06d8a8009d17f1b50ca57ae14b9 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
@@ -76,7 +76,7 @@
                led-upgrade = &power_amber;
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                wps {

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
index 9a7c715518fc73d5ef3054f94514df98688292d3..0968cb11a18984c7be42009609564a9ca623d13d 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
@@ -118,7 +118,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                reset {

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
index 2809a67693ba89d01b658d3e526e3c3922946ce7..380136abbb5749b30d91cca10c497eb4bbcabaeb 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
@@ -114,7 +114,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                wps {

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-a62.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-a62.dts
index 88b60be1752c75e725113e4f6be5cd53440c638f..747676404a1b7866db391e1a7b125c9203bfc815 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-a62.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4019-a62.dts
@@ -83,7 +83,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                reset {

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
index 58e13da7b79a45f6a99a5aab422a524612d650e9..cbb7d5aac66e0af80c141d2d4c44d7ad5f768a26 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
@@ -88,7 +88,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                reset {

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
index b1f71efcffd389a8604bf5c84312fb7882668e61..092534fdc60eea9accdb4248e7414183229db8c8 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
@@ -97,7 +97,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                wps {

diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts
index bfebad0e65ad6dc5cc5f09ee1fa315805cd1c555..3981f7145314d80268466eab88b5f1748ed2d2f6 100644 (file)
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-a42.dts
@@ -84,7 +84,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                reset {

diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
index f7ef4cd026954f529d18a70b24f153df31875ec2..3187bcb90e9709baeeb2488f6e23d2a676cf0fb9 100644 (file)
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-eap1300.dts
@@ -57,7 +57,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                reset {

diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
index 348f25296120d999a65022e4d6604ce5ebbec4ad..aa16acca908063646eb0d1659ece4c9ab9caa886 100644 (file)
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
@@ -80,7 +80,7 @@
                led-upgrade = &power_amber;
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                wps {

diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
index c09962dc084f583f825556b323545a0b7a37a9ff..1f0e7a7aeea0d96942fdd5a849128d5b17a3664d 100644 (file)
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
@@ -118,7 +118,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                wps {

diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts
index 72c4f0e9157a1f9d058712cbfaa7674acd948bc8..b08a4947efb2ec79b175008eedd8c694abf546b9 100644 (file)
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-a62.dts
@@ -87,7 +87,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                reset {

diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
index 188c28e8c7aa2e117f05fdfda79061e237c11885..98732e041c6a60025025a4b2f05a2d2468381295 100644 (file)
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4028-wpj428.dts
@@ -92,7 +92,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                reset {

diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
index b4937de07ce6b91347572646d0c3dd557bd84dae..74f56291a307489841a609ebb52067a6899a0ff0 100644 (file)
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
@@ -101,7 +101,7 @@
                };
        };
 
-       gpio-keys {
+       keys {
                compatible = "gpio-keys";
 
                wps {