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 <[email protected]>
Cc: Matt Merhar <[email protected]>
Cc: Jonas Gorski <[email protected]>
Signed-off-by: Petr Štetiar <[email protected]>

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>;
 		};
 	};
 };

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 };

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 };

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 };

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 };

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 };

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};
 

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>;
 		};
 	};