ath79, brcm63xx: Fix debounce-interval properties in gpio-keys-polled nodes

This patch fixes wrong usage of debounce-interval subnode property of
gpio-keys-polled nodes, which was used inproperly in parent node, but it
belongs to the subnodes, excerpt from the docs:

 Optional subnode-properties:
     - debounce-interval: Debouncing interval time in milliseconds.
       If not specified defaults to 5.

And the docs are up to date as the source code matches that description
as well:

 if (fwnode_property_read_u32(child, "debounce-interval",
                              &button->debounce_interval))
         button->debounce_interval = 5;

While at it, I've also re-formatted gpio-keys-polled nodes, usually just
adding new lines after every key subnode.

Cc: Tomasz Maciej Nowak <tomek_n@o2.pl>
Cc: Matt Merhar <mattmerhar@protonmail.com>
Cc: Jonas Gorski <jonas.gorski@gmail.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>

70 files changed, 181 insertions, 71 deletions

diff --git a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
index 143a4b7e80b..a116351be91 100644
--- a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
+++ b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi
@@ -38,12 +38,12 @@
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wps {
 			label = "sw4";
 			linux,code = <KEY_RESTART>;
 			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+			debounce-interval = <60>;
 		};
 	};
 };
diff --git a/target/linux/brcm63xx/dts/a226g.dts b/target/linux/brcm63xx/dts/a226g.dts
index 5269fab2bbc..a77a1b2ae0c 100644
--- a/target/linux/brcm63xx/dts/a226g.dts
+++ b/target/linux/brcm63xx/dts/a226g.dts
@@ -18,17 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 37 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/a226m-fwb.dts b/target/linux/brcm63xx/dts/a226m-fwb.dts
index 0695e839e58..1785c7a3c9e 100644
--- a/target/linux/brcm63xx/dts/a226m-fwb.dts
+++ b/target/linux/brcm63xx/dts/a226m-fwb.dts
@@ -18,17 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 37 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/a226m.dts b/target/linux/brcm63xx/dts/a226m.dts
index aea54c3d8b2..190f0933bea 100644
--- a/target/linux/brcm63xx/dts/a226m.dts
+++ b/target/linux/brcm63xx/dts/a226m.dts
@@ -18,17 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 37 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/a4001n.dts b/target/linux/brcm63xx/dts/a4001n.dts
index fcd921fa447..2a42122e2b4 100644
--- a/target/linux/brcm63xx/dts/a4001n.dts
+++ b/target/linux/brcm63xx/dts/a4001n.dts
@@ -18,17 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 23 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 24 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/a4001n1.dts b/target/linux/brcm63xx/dts/a4001n1.dts
index 3cb95e8f2e8..d4c0b36edb3 100644
--- a/target/linux/brcm63xx/dts/a4001n1.dts
+++ b/target/linux/brcm63xx/dts/a4001n1.dts
@@ -18,17 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 23 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wlan";
 			gpios = <&pinctrl 24 1>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/ad1018-nor.dts b/target/linux/brcm63xx/dts/ad1018-nor.dts
index 4794d45d742..2763337fbb1 100644
--- a/target/linux/brcm63xx/dts/ad1018-nor.dts
+++ b/target/linux/brcm63xx/dts/ad1018-nor.dts
@@ -18,22 +18,26 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 24 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
+
 		wifi {
 			label = "wifi";
 			gpios = <&pinctrl 25 1>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 31 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 };
diff --git a/target/linux/brcm63xx/dts/agpf-s0.dts b/target/linux/brcm63xx/dts/agpf-s0.dts
index 46aa399bdc4..aba37672c19 100644
--- a/target/linux/brcm63xx/dts/agpf-s0.dts
+++ b/target/linux/brcm63xx/dts/agpf-s0.dts
@@ -18,17 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 37 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/ar-5315u.dts b/target/linux/brcm63xx/dts/ar-5315u.dts
index 5f38f3ed164..91ebe489e0f 100644
--- a/target/linux/brcm63xx/dts/ar-5315u.dts
+++ b/target/linux/brcm63xx/dts/ar-5315u.dts
@@ -18,17 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 3 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 33 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/ar-5381u.dts b/target/linux/brcm63xx/dts/ar-5381u.dts
index 7a54778020e..5e3513c9fe8 100644
--- a/target/linux/brcm63xx/dts/ar-5381u.dts
+++ b/target/linux/brcm63xx/dts/ar-5381u.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 23 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/ar-5387un.dts b/target/linux/brcm63xx/dts/ar-5387un.dts
index 3a83834bde2..f30997af8f1 100644
--- a/target/linux/brcm63xx/dts/ar-5387un.dts
+++ b/target/linux/brcm63xx/dts/ar-5387un.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 23 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/ar1004g.dts b/target/linux/brcm63xx/dts/ar1004g.dts
index c7f8c506879..2dd01bcfabc 100644
--- a/target/linux/brcm63xx/dts/ar1004g.dts
+++ b/target/linux/brcm63xx/dts/ar1004g.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 33 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/av4202n.dts b/target/linux/brcm63xx/dts/av4202n.dts
index e61baf94a18..7600f47f91f 100644
--- a/target/linux/brcm63xx/dts/av4202n.dts
+++ b/target/linux/brcm63xx/dts/av4202n.dts
@@ -19,17 +19,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wlan {
 			label = "wlan";
 			gpios = <&pinctrl 37 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/bcm96318ref.dts b/target/linux/brcm63xx/dts/bcm96318ref.dts
index 835b1c2f306..8a74a809182 100644
--- a/target/linux/brcm63xx/dts/bcm96318ref.dts
+++ b/target/linux/brcm63xx/dts/bcm96318ref.dts
@@ -18,18 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 33 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts b/target/linux/brcm63xx/dts/bcm96318ref_p300.dts
index 5cd5b78c345..506c9922639 100644
--- a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts
+++ b/target/linux/brcm63xx/dts/bcm96318ref_p300.dts
@@ -18,18 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 33 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts b/target/linux/brcm63xx/dts/bcm963268bu_p300.dts
index 6122d7306b6..d9d2c40c1f2 100644
--- a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts
+++ b/target/linux/brcm63xx/dts/bcm963268bu_p300.dts
@@ -18,18 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 32 0>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 33 0>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 };
diff --git a/target/linux/brcm63xx/dts/bcm963269bhr.dts b/target/linux/brcm63xx/dts/bcm963269bhr.dts
index 2e3211083c7..4fd41f327ce 100644
--- a/target/linux/brcm63xx/dts/bcm963269bhr.dts
+++ b/target/linux/brcm63xx/dts/bcm963269bhr.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 32 0>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/bcm96348GW-10.dts b/target/linux/brcm63xx/dts/bcm96348GW-10.dts
index 6f54664ff0c..94dc38f3b8a 100644
--- a/target/linux/brcm63xx/dts/bcm96348GW-10.dts
+++ b/target/linux/brcm63xx/dts/bcm96348GW-10.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 6 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/bcm96348GW-11.dts b/target/linux/brcm63xx/dts/bcm96348GW-11.dts
index c1dfaf6b0b9..5c42ea7dc61 100644
--- a/target/linux/brcm63xx/dts/bcm96348GW-11.dts
+++ b/target/linux/brcm63xx/dts/bcm96348GW-11.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 33 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/bcm96348GW.dts b/target/linux/brcm63xx/dts/bcm96348GW.dts
index cc0ebd2629d..7961d8c82db 100644
--- a/target/linux/brcm63xx/dts/bcm96348GW.dts
+++ b/target/linux/brcm63xx/dts/bcm96348GW.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 36 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/cpva502plus.dts b/target/linux/brcm63xx/dts/cpva502plus.dts
index ee5472eefc1..2d45ae3f30f 100644
--- a/target/linux/brcm63xx/dts/cpva502plus.dts
+++ b/target/linux/brcm63xx/dts/cpva502plus.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 36 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/cpva642.dts b/target/linux/brcm63xx/dts/cpva642.dts
index 649aae2d7b7..95ea7da5196 100644
--- a/target/linux/brcm63xx/dts/cpva642.dts
+++ b/target/linux/brcm63xx/dts/cpva642.dts
@@ -18,17 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 36 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 37 0>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/ct-5365.dts b/target/linux/brcm63xx/dts/ct-5365.dts
index 691479af75d..c6600f6e40f 100644
--- a/target/linux/brcm63xx/dts/ct-5365.dts
+++ b/target/linux/brcm63xx/dts/ct-5365.dts
@@ -18,22 +18,26 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 33 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wlan {
 			label = "wlan";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 35 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/ct-6373.dts b/target/linux/brcm63xx/dts/ct-6373.dts
index 9b450dc6bc1..60bf25fb7cf 100644
--- a/target/linux/brcm63xx/dts/ct-6373.dts
+++ b/target/linux/brcm63xx/dts/ct-6373.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 35 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/ct536plus.dts b/target/linux/brcm63xx/dts/ct536plus.dts
index 04d8033ec8f..4533af8a7ee 100644
--- a/target/linux/brcm63xx/dts/ct536plus.dts
+++ b/target/linux/brcm63xx/dts/ct536plus.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 33 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/dg834g_v4.dts b/target/linux/brcm63xx/dts/dg834g_v4.dts
index 77b7323cfbc..ff2c0d5627a 100644
--- a/target/linux/brcm63xx/dts/dg834g_v4.dts
+++ b/target/linux/brcm63xx/dts/dg834g_v4.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 6 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/dg834gtpn.dts b/target/linux/brcm63xx/dts/dg834gtpn.dts
index ff9c8538171..8fefe4a6f6a 100644
--- a/target/linux/brcm63xx/dts/dg834gtpn.dts
+++ b/target/linux/brcm63xx/dts/dg834gtpn.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 6 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/dgnd3700v1.dts b/target/linux/brcm63xx/dts/dgnd3700v1.dts
index a98664822fc..052f3f6b85c 100644
--- a/target/linux/brcm63xx/dts/dgnd3700v1.dts
+++ b/target/linux/brcm63xx/dts/dgnd3700v1.dts
@@ -18,22 +18,26 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wlan {
 			label = "wlan";
 			gpios = <&pinctrl 10 1>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 12 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 35 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/dsl-2640b-b.dts b/target/linux/brcm63xx/dts/dsl-2640b-b.dts
index 1ce0d65d65f..79cc061e257 100644
--- a/target/linux/brcm63xx/dts/dsl-2640b-b.dts
+++ b/target/linux/brcm63xx/dts/dsl-2640b-b.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 7 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/dsl-274xb-c.dts b/target/linux/brcm63xx/dts/dsl-274xb-c.dts
index f6042cd9772..c5d0672875f 100644
--- a/target/linux/brcm63xx/dts/dsl-274xb-c.dts
+++ b/target/linux/brcm63xx/dts/dsl-274xb-c.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/dsl-274xb-f.dts b/target/linux/brcm63xx/dts/dsl-274xb-f.dts
index 052584b7e52..3fdcf7c05a2 100644
--- a/target/linux/brcm63xx/dts/dsl-274xb-f.dts
+++ b/target/linux/brcm63xx/dts/dsl-274xb-f.dts
@@ -18,22 +18,26 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wifi {
 			label = "wifi";
 			gpios = <&pinctrl 10 1>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 23 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 24 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/dsl-275xb-d.dts b/target/linux/brcm63xx/dts/dsl-275xb-d.dts
index ae773fe1926..63388ef1403 100644
--- a/target/linux/brcm63xx/dts/dsl-275xb-d.dts
+++ b/target/linux/brcm63xx/dts/dsl-275xb-d.dts
@@ -18,24 +18,26 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wifi {
 			label = "wifi";
 			gpios = <&pinctrl 2 1>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 33 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts
index bc8750577c9..342a7d60530 100644
--- a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts
+++ b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/evg2000.dts b/target/linux/brcm63xx/dts/evg2000.dts
index 122fa50f3ad..d68568a7c13 100644
--- a/target/linux/brcm63xx/dts/evg2000.dts
+++ b/target/linux/brcm63xx/dts/evg2000.dts
@@ -18,17 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 25 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 26 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/f5d7633.dts b/target/linux/brcm63xx/dts/f5d7633.dts
index 81f14ec3c00..782c70b3987 100644
--- a/target/linux/brcm63xx/dts/f5d7633.dts
+++ b/target/linux/brcm63xx/dts/f5d7633.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 6 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/fast2504n.dts b/target/linux/brcm63xx/dts/fast2504n.dts
index 22349d9f9aa..508f8d72da7 100644
--- a/target/linux/brcm63xx/dts/fast2504n.dts
+++ b/target/linux/brcm63xx/dts/fast2504n.dts
@@ -18,17 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 24 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 25 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/fast2604.dts b/target/linux/brcm63xx/dts/fast2604.dts
index ad8093c6a48..72eec51889e 100644
--- a/target/linux/brcm63xx/dts/fast2604.dts
+++ b/target/linux/brcm63xx/dts/fast2604.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 33 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/fast2704n.dts b/target/linux/brcm63xx/dts/fast2704n.dts
index b29367913bc..4438ea2c606 100644
--- a/target/linux/brcm63xx/dts/fast2704n.dts
+++ b/target/linux/brcm63xx/dts/fast2704n.dts
@@ -18,22 +18,26 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wlan {
 			label = "wlan";
 			gpios = <&pinctrl 1 0>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 33 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/fast2704v2.dts b/target/linux/brcm63xx/dts/fast2704v2.dts
index 47a998f2984..44fe107111e 100644
--- a/target/linux/brcm63xx/dts/fast2704v2.dts
+++ b/target/linux/brcm63xx/dts/fast2704v2.dts
@@ -18,22 +18,26 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		rfkill {
 			label = "rfkill";
 			gpios = <&pinctrl 15 1>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 23 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 24 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/gw6000.dts b/target/linux/brcm63xx/dts/gw6000.dts
index 063bc6b24b1..73d59b94704 100644
--- a/target/linux/brcm63xx/dts/gw6000.dts
+++ b/target/linux/brcm63xx/dts/gw6000.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 36 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 };
diff --git a/target/linux/brcm63xx/dts/gw6200.dts b/target/linux/brcm63xx/dts/gw6200.dts
index 51f29472641..951cb5595bd 100644
--- a/target/linux/brcm63xx/dts/gw6200.dts
+++ b/target/linux/brcm63xx/dts/gw6200.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 36 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/hg520v.dts b/target/linux/brcm63xx/dts/hg520v.dts
index 0a809c163f5..4473362c5af 100644
--- a/target/linux/brcm63xx/dts/hg520v.dts
+++ b/target/linux/brcm63xx/dts/hg520v.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 37 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/hg553.dts b/target/linux/brcm63xx/dts/hg553.dts
index 36e6d8c332a..c23dba00e6b 100644
--- a/target/linux/brcm63xx/dts/hg553.dts
+++ b/target/linux/brcm63xx/dts/hg553.dts
@@ -18,18 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		rfkill {
 			label = "rfkill";
 			gpios = <&pinctrl 9 1>;
 			linux,code = <KEY_RFKILL>;
+			debounce-interval = <60>;
 		};
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 37 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/hg556a-a.dts b/target/linux/brcm63xx/dts/hg556a-a.dts
index 71ae3deafaf..7c935208b45 100644
--- a/target/linux/brcm63xx/dts/hg556a-a.dts
+++ b/target/linux/brcm63xx/dts/hg556a-a.dts
@@ -18,27 +18,33 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		help {
 			label = "help";
 			gpios = <&pinctrl 8 1>;
 			linux,code = <KEY_HELP>;
+			debounce-interval = <60>;
 		};
+
 		wlan {
 			label = "wlan";
 			gpios = <&pinctrl 9 1>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
+
 		restart {
 			label = "restart";
 			gpios = <&pinctrl 10 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 11 1>;
 			linux,code = <KEY_CONFIG>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/hg556a-b.dts b/target/linux/brcm63xx/dts/hg556a-b.dts
index 203ca995ac8..a66dba6c4c9 100644
--- a/target/linux/brcm63xx/dts/hg556a-b.dts
+++ b/target/linux/brcm63xx/dts/hg556a-b.dts
@@ -18,27 +18,33 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		help {
 			label = "help";
 			gpios = <&pinctrl 8 1>;
 			linux,code = <KEY_HELP>;
+			debounce-interval = <60>;
 		};
+
 		wlan {
 			label = "wlan";
 			gpios = <&pinctrl 9 1>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
+
 		restart {
 			label = "restart";
 			gpios = <&pinctrl 10 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 11 1>;
 			linux,code = <KEY_CONFIG>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/hg556a-c.dts b/target/linux/brcm63xx/dts/hg556a-c.dts
index 90cc8a507c0..cfcc70a80d6 100644
--- a/target/linux/brcm63xx/dts/hg556a-c.dts
+++ b/target/linux/brcm63xx/dts/hg556a-c.dts
@@ -18,27 +18,33 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		help {
 			label = "help";
 			gpios = <&pinctrl 36 1>;
 			linux,code = <KEY_HELP>;
+			debounce-interval = <60>;
 		};
+
 		wlan {
 			label = "wlan";
 			gpios = <&pinctrl 9 1>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
+
 		restart {
 			label = "restart";
 			gpios = <&pinctrl 10 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 11 1>;
 			linux,code = <KEY_CONFIG>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/hg622.dts b/target/linux/brcm63xx/dts/hg622.dts
index f34009a28fe..de4a5cb622b 100644
--- a/target/linux/brcm63xx/dts/hg622.dts
+++ b/target/linux/brcm63xx/dts/hg622.dts
@@ -19,12 +19,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/hg655b.dts b/target/linux/brcm63xx/dts/hg655b.dts
index 6766b43eca5..28b2ed11c09 100644
--- a/target/linux/brcm63xx/dts/hg655b.dts
+++ b/target/linux/brcm63xx/dts/hg655b.dts
@@ -18,22 +18,26 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 12 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
+
 		wlan {
 			label = "wlan";
 			gpios = <&pinctrl 23 1>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/homehub2a.dts b/target/linux/brcm63xx/dts/homehub2a.dts
index dfc3f1380b2..59efb774fe8 100644
--- a/target/linux/brcm63xx/dts/homehub2a.dts
+++ b/target/linux/brcm63xx/dts/homehub2a.dts
@@ -18,22 +18,26 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		phone {
 			label = "phone";
 			gpios = <&pinctrl 1 1>;
 			linux,code = <KEY_PHONE>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 9 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 11 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 };
diff --git a/target/linux/brcm63xx/dts/livebox-blue-5g.dts b/target/linux/brcm63xx/dts/livebox-blue-5g.dts
index f8d5dfce5be..6eba3b8551f 100644
--- a/target/linux/brcm63xx/dts/livebox-blue-5g.dts
+++ b/target/linux/brcm63xx/dts/livebox-blue-5g.dts
@@ -17,20 +17,20 @@
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
-
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		button1 {
 			label = "1";
 			gpios = <&pinctrl 36 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 
 		button2 {
 			label = "2";
 			gpios = <&pinctrl 7 1>;
 			linux,code = <BTN_2>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
index 76c55b4fd06..b9836fd3f17 100644
--- a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
+++ b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
@@ -18,27 +18,33 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		service {
 			label = "service";
 			gpios = <&pinctrl 27 1>;
 			linux,code = <BTN_0>;
+			debounce-interval = <60>;
 		};
+
 		clip {
 			label = "clip";
 			gpios = <&pinctrl 31 1>;
 			linux,code = <BTN_1>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 37 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/nb4-ser-r0.dts b/target/linux/brcm63xx/dts/nb4-ser-r0.dts
index 09b34cc9dea..b546dae96d5 100644
--- a/target/linux/brcm63xx/dts/nb4-ser-r0.dts
+++ b/target/linux/brcm63xx/dts/nb4-ser-r0.dts
@@ -18,27 +18,33 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		service {
 			label = "service";
 			gpios = <&pinctrl 27 1>;
 			linux,code = <BTN_0>;
+			debounce-interval = <60>;
 		};
+
 		clip {
 			label = "clip";
 			gpios = <&pinctrl 31 1>;
 			linux,code = <BTN_1>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 37 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/nb6-ser-r0.dts b/target/linux/brcm63xx/dts/nb6-ser-r0.dts
index 5ebfca6fb48..d91f1ebfec9 100644
--- a/target/linux/brcm63xx/dts/nb6-ser-r0.dts
+++ b/target/linux/brcm63xx/dts/nb6-ser-r0.dts
@@ -18,27 +18,33 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		service {
 			label = "service";
 			gpios = <&pinctrl 10 1>;
 			linux,code = <BTN_0>;
+			debounce-interval = <60>;
 		};
+
 		wlan {
 			label = "wlan";
 			gpios = <&pinctrl 12 1>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 24 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 25 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts
index 20d820bd182..504817c3ea7 100644
--- a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts
+++ b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts
@@ -18,17 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 35 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 36 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/r1000h.dts b/target/linux/brcm63xx/dts/r1000h.dts
index 9434060da12..22be696b60c 100644
--- a/target/linux/brcm63xx/dts/r1000h.dts
+++ b/target/linux/brcm63xx/dts/r1000h.dts
@@ -18,18 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 35 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/r5010unv2.dts b/target/linux/brcm63xx/dts/r5010unv2.dts
index af9633c8b88..8f1142d82fe 100644
--- a/target/linux/brcm63xx/dts/r5010unv2.dts
+++ b/target/linux/brcm63xx/dts/r5010unv2.dts
@@ -19,17 +19,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 23 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 24 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/rta770bw.dts b/target/linux/brcm63xx/dts/rta770bw.dts
index fd99780f882..17d3cf95d6b 100644
--- a/target/linux/brcm63xx/dts/rta770bw.dts
+++ b/target/linux/brcm63xx/dts/rta770bw.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 13 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/rta770w.dts b/target/linux/brcm63xx/dts/rta770w.dts
index e057a70ed8a..09b27e41c72 100644
--- a/target/linux/brcm63xx/dts/rta770w.dts
+++ b/target/linux/brcm63xx/dts/rta770w.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 13 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/spw303v.dts b/target/linux/brcm63xx/dts/spw303v.dts
index 3317fc85eba..5edab551fd4 100644
--- a/target/linux/brcm63xx/dts/spw303v.dts
+++ b/target/linux/brcm63xx/dts/spw303v.dts
@@ -18,17 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 11 0>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		ses {
 			label = "ses";
 			gpios = <&pinctrl 37 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/spw500v.dts b/target/linux/brcm63xx/dts/spw500v.dts
index c55fdf84026..246102116cd 100644
--- a/target/linux/brcm63xx/dts/spw500v.dts
+++ b/target/linux/brcm63xx/dts/spw500v.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 33 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/sr102.dts b/target/linux/brcm63xx/dts/sr102.dts
index e34a6816925..f5d9044b809 100644
--- a/target/linux/brcm63xx/dts/sr102.dts
+++ b/target/linux/brcm63xx/dts/sr102.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 33 0>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/td-w8900gb.dts b/target/linux/brcm63xx/dts/td-w8900gb.dts
index 513c40ac661..cb538115fa9 100644
--- a/target/linux/brcm63xx/dts/td-w8900gb.dts
+++ b/target/linux/brcm63xx/dts/td-w8900gb.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 33 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/v2110.dts b/target/linux/brcm63xx/dts/v2110.dts
index a400d5ab9af..dd66b00825b 100644
--- a/target/linux/brcm63xx/dts/v2110.dts
+++ b/target/linux/brcm63xx/dts/v2110.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 33 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/v2500v-bb.dts b/target/linux/brcm63xx/dts/v2500v-bb.dts
index 7d47683bafb..5376d18e51b 100644
--- a/target/linux/brcm63xx/dts/v2500v-bb.dts
+++ b/target/linux/brcm63xx/dts/v2500v-bb.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 31 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/vg50.dts b/target/linux/brcm63xx/dts/vg50.dts
index 140213b5834..97b4275dffc 100644
--- a/target/linux/brcm63xx/dts/vg50.dts
+++ b/target/linux/brcm63xx/dts/vg50.dts
@@ -18,18 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 32 0>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 34 0>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 };
diff --git a/target/linux/brcm63xx/dts/vh4032n.dts b/target/linux/brcm63xx/dts/vh4032n.dts
index 1296fbf14bd..6788026d625 100644
--- a/target/linux/brcm63xx/dts/vh4032n.dts
+++ b/target/linux/brcm63xx/dts/vh4032n.dts
@@ -18,17 +18,19 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 35 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/vr-3025u.dts b/target/linux/brcm63xx/dts/vr-3025u.dts
index 126ca94fa78..765433133d6 100644
--- a/target/linux/brcm63xx/dts/vr-3025u.dts
+++ b/target/linux/brcm63xx/dts/vr-3025u.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/vr-3025un.dts b/target/linux/brcm63xx/dts/vr-3025un.dts
index 5e57036d021..139d79b4d37 100644
--- a/target/linux/brcm63xx/dts/vr-3025un.dts
+++ b/target/linux/brcm63xx/dts/vr-3025un.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/vr-3026e.dts b/target/linux/brcm63xx/dts/vr-3026e.dts
index 7439a2e62cd..9d4fa5e693c 100644
--- a/target/linux/brcm63xx/dts/vr-3026e.dts
+++ b/target/linux/brcm63xx/dts/vr-3026e.dts
@@ -18,12 +18,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
 	};
 
diff --git a/target/linux/brcm63xx/dts/wap-5813n.dts b/target/linux/brcm63xx/dts/wap-5813n.dts
index 9a66895bd5c..298d7791b27 100644
--- a/target/linux/brcm63xx/dts/wap-5813n.dts
+++ b/target/linux/brcm63xx/dts/wap-5813n.dts
@@ -18,22 +18,26 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
-		debounce-interval = <60>;
 
 		wlan {
 			label = "wlan";
 			gpios = <&pinctrl 32 1>;
 			linux,code = <KEY_WLAN>;
+			debounce-interval = <60>;
 		};
+
 		reset {
 			label = "reset";
 			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
+			debounce-interval = <60>;
 		};
+
 		wps {
 			label = "wps";
 			gpios = <&pinctrl 35 1>;
 			linux,code = <KEY_WPS_BUTTON>;
+			debounce-interval = <60>;
 		};
 	};