apm821xx: align gpio-keys node names with dt-schema

As per the series:
<https://www.spinics.net/lists/devicetree/msg508906.html>

"Enforce specific naming pattern for children (keys) to narrow the
pattern thus do not match other properties.  This will require all
children to be properly prefixed or suffixed (button, event, switch
or key)."

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/target/linux/apm821xx/dts/meraki-mr24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts
index 4b43c683e12b82a5e2644b79837c3427be5b5005..14bedc59843c5b35728ce473ef1f84d8f8014a17 100644 (file)
--- a/target/linux/apm821xx/dts/meraki-mr24.dts
+++ b/target/linux/apm821xx/dts/meraki-mr24.dts
@@ -180,7 +180,7 @@
        keys {
                compatible = "gpio-keys";
 
-               reset {
+               button-restart {
                        /* Label as per Meraki's "MR24 Installation Guide" */
                        label = "Factory Reset Button";
                        linux,code = <KEY_RESTART>;

diff --git a/target/linux/apm821xx/dts/meraki-mx60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts
index 79e055c2eaf26ed33aa9cf4223d399687aac4e67..33f9a3d9f787193fef8c021d5a76b0b4ad649004 100644 (file)
--- a/target/linux/apm821xx/dts/meraki-mx60.dts
+++ b/target/linux/apm821xx/dts/meraki-mx60.dts
@@ -175,7 +175,7 @@
        keys {
                compatible = "gpio-keys";
 
-               reset {
+               button-restart {
                        label = "Reset button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&GPIO0 16 GPIO_ACTIVE_LOW>;

diff --git a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
index 8a15a78dce6ea70ed96250c80fe27449d6337965..144b17950e86a89b07247a475b135e5c43de7a7f 100644 (file)
--- a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
+++ b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
@@ -130,7 +130,7 @@
        keys {
                compatible = "gpio-keys";
 
-               reset {
+               button-restart {
                        label = "Reset Button";
                        gpios = <&GPIO0 16 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;

diff --git a/target/linux/apm821xx/dts/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts
index 342f9a01dbdfd9410793f89a887478c349c437d0..cbfe1235e955392aaccc223e9ca2fbca353bc816 100644 (file)
--- a/target/linux/apm821xx/dts/netgear-wndr4700.dts
+++ b/target/linux/apm821xx/dts/netgear-wndr4700.dts
@@ -355,7 +355,7 @@
        keys {
                compatible = "gpio-keys";
 
-               reset {
+               button-restart {
                        label = "Reset button";
                        gpios = <&GPIO0 15 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
@@ -364,7 +364,7 @@
                        debounce-interval = <60>;
                };
 
-               backup_hd {
+               button-backup_hd {
                        label = "Backup HD button";
                        gpios = <&GPIO0 19 GPIO_ACTIVE_LOW>;
                        linux,code = <BTN_0>;
@@ -373,7 +373,7 @@
                        debounce-interval = <60>;
                };
 
-               rfkill {
+               button-rfkill {
                        label = "RFKILL button";
                        gpios = <&GPIO0 20 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RFKILL>;
@@ -382,7 +382,7 @@
                        debounce-interval = <60>;
                };
 
-               wps {
+               button-wps {
                        label = "WPS button";
                        gpios = <&GPIO0 23 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;

diff --git a/target/linux/apm821xx/dts/wd-mybooklive.dts b/target/linux/apm821xx/dts/wd-mybooklive.dts
index 5fcddb0cd869e9ef6db891f77262852d7c8efbdf..588f45078cd470ac9da5a7e5e0c7b82ecaa75819 100644 (file)
--- a/target/linux/apm821xx/dts/wd-mybooklive.dts
+++ b/target/linux/apm821xx/dts/wd-mybooklive.dts
@@ -116,7 +116,7 @@
                poll-interval = <60>;   /* 3 * 20 = 60ms */
                autorepeat;
 
-               reset-button {
+               button-restart {
                        label = "Reset button";
                        linux,code = <KEY_RESTART>;
                        gpios = <&GPIO2 2 GPIO_ACTIVE_LOW>;