From: Petr Štetiar Date: Tue, 11 Dec 2018 22:02:04 +0000 (+0100) Subject: ath79, brcm63xx: Fix debounce-interval properties in gpio-keys-polled nodes X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d9753f0ec58429c9b9aa92918ff736004e4ca0d0;p=openwrt%2Fstaging%2Faparcar.git 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 Cc: Matt Merhar Cc: Jonas Gorski Signed-off-by: Petr Štetiar --- diff --git a/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi b/target/linux/ath79/dts/ar7161_ubnt_routerstation.dtsi index 143a4b7e80..a116351be9 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 = ; 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 5269fab2bb..a77a1b2ae0 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 = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 37 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/a226m-fwb.dts b/target/linux/brcm63xx/dts/a226m-fwb.dts index 0695e839e5..1785c7a3c9 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 = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 37 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/a226m.dts b/target/linux/brcm63xx/dts/a226m.dts index aea54c3d8b..190f0933be 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 = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 37 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/a4001n.dts b/target/linux/brcm63xx/dts/a4001n.dts index fcd921fa44..2a42122e2b 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 = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 24 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/a4001n1.dts b/target/linux/brcm63xx/dts/a4001n1.dts index 3cb95e8f2e..d4c0b36edb 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 = ; + debounce-interval = <60>; }; + wps { label = "wlan"; gpios = <&pinctrl 24 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/ad1018-nor.dts b/target/linux/brcm63xx/dts/ad1018-nor.dts index 4794d45d74..2763337fbb 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 = ; + debounce-interval = <60>; }; + wifi { label = "wifi"; gpios = <&pinctrl 25 1>; linux,code = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 31 1>; linux,code = ; + debounce-interval = <60>; }; }; }; diff --git a/target/linux/brcm63xx/dts/agpf-s0.dts b/target/linux/brcm63xx/dts/agpf-s0.dts index 46aa399bdc..aba37672c1 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 = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 37 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/ar-5315u.dts b/target/linux/brcm63xx/dts/ar-5315u.dts index 5f38f3ed16..91ebe489e0 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 = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 33 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/ar-5381u.dts b/target/linux/brcm63xx/dts/ar-5381u.dts index 7a54778020..5e3513c9fe 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/ar-5387un.dts b/target/linux/brcm63xx/dts/ar-5387un.dts index 3a83834bde..f30997af8f 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/ar1004g.dts b/target/linux/brcm63xx/dts/ar1004g.dts index c7f8c50687..2dd01bcfab 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/av4202n.dts b/target/linux/brcm63xx/dts/av4202n.dts index e61baf94a1..7600f47f91 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 = ; + debounce-interval = <60>; }; + wlan { label = "wlan"; gpios = <&pinctrl 37 GPIO_ACTIVE_LOW>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/bcm96318ref.dts b/target/linux/brcm63xx/dts/bcm96318ref.dts index 835b1c2f30..8a74a80918 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 = ; + debounce-interval = <60>; }; reset { label = "reset"; gpios = <&pinctrl 34 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts b/target/linux/brcm63xx/dts/bcm96318ref_p300.dts index 5cd5b78c34..506c992263 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 = ; + debounce-interval = <60>; }; reset { label = "reset"; gpios = <&pinctrl 34 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts b/target/linux/brcm63xx/dts/bcm963268bu_p300.dts index 6122d7306b..d9d2c40c1f 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 = ; + debounce-interval = <60>; }; wps { label = "wps"; gpios = <&pinctrl 33 0>; linux,code = ; + debounce-interval = <60>; }; }; }; diff --git a/target/linux/brcm63xx/dts/bcm963269bhr.dts b/target/linux/brcm63xx/dts/bcm963269bhr.dts index 2e3211083c..4fd41f327c 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/bcm96348GW-10.dts b/target/linux/brcm63xx/dts/bcm96348GW-10.dts index 6f54664ff0..94dc38f3b8 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/bcm96348GW-11.dts b/target/linux/brcm63xx/dts/bcm96348GW-11.dts index c1dfaf6b0b..5c42ea7dc6 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/bcm96348GW.dts b/target/linux/brcm63xx/dts/bcm96348GW.dts index cc0ebd2629..7961d8c82d 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/cpva502plus.dts b/target/linux/brcm63xx/dts/cpva502plus.dts index ee5472eefc..2d45ae3f30 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/cpva642.dts b/target/linux/brcm63xx/dts/cpva642.dts index 649aae2d7b..95ea7da519 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 = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 37 0>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/ct-5365.dts b/target/linux/brcm63xx/dts/ct-5365.dts index 691479af75..c6600f6e40 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 = ; + debounce-interval = <60>; }; + wlan { label = "wlan"; gpios = <&pinctrl 34 1>; linux,code = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 35 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/ct-6373.dts b/target/linux/brcm63xx/dts/ct-6373.dts index 9b450dc6bc..60bf25fb7c 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/ct536plus.dts b/target/linux/brcm63xx/dts/ct536plus.dts index 04d8033ec8..4533af8a7e 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/dg834g_v4.dts b/target/linux/brcm63xx/dts/dg834g_v4.dts index 77b7323cfb..ff2c0d5627 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/dg834gtpn.dts b/target/linux/brcm63xx/dts/dg834gtpn.dts index ff9c853817..8fefe4a6f6 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/dgnd3700v1.dts b/target/linux/brcm63xx/dts/dgnd3700v1.dts index a98664822f..052f3f6b85 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 = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 12 1>; linux,code = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 35 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/dsl-2640b-b.dts b/target/linux/brcm63xx/dts/dsl-2640b-b.dts index 1ce0d65d65..79cc061e25 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/dsl-274xb-c.dts b/target/linux/brcm63xx/dts/dsl-274xb-c.dts index f6042cd977..c5d0672875 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/dsl-274xb-f.dts b/target/linux/brcm63xx/dts/dsl-274xb-f.dts index 052584b7e5..3fdcf7c05a 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 = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 23 1>; linux,code = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 24 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/dsl-275xb-d.dts b/target/linux/brcm63xx/dts/dsl-275xb-d.dts index ae773fe192..63388ef140 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 = ; + debounce-interval = <60>; }; wps { label = "wps"; gpios = <&pinctrl 33 1>; linux,code = ; + debounce-interval = <60>; }; reset { label = "reset"; gpios = <&pinctrl 34 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts index bc8750577c..342a7d6053 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/evg2000.dts b/target/linux/brcm63xx/dts/evg2000.dts index 122fa50f3a..d68568a7c1 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 = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 26 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/f5d7633.dts b/target/linux/brcm63xx/dts/f5d7633.dts index 81f14ec3c0..782c70b398 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/fast2504n.dts b/target/linux/brcm63xx/dts/fast2504n.dts index 22349d9f9a..508f8d72da 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 = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 25 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/fast2604.dts b/target/linux/brcm63xx/dts/fast2604.dts index ad8093c6a4..72eec51889 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/fast2704n.dts b/target/linux/brcm63xx/dts/fast2704n.dts index b29367913b..4438ea2c60 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 = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 33 1>; linux,code = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 34 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/fast2704v2.dts b/target/linux/brcm63xx/dts/fast2704v2.dts index 47a998f298..44fe107111 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 = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 23 1>; linux,code = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 24 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/gw6000.dts b/target/linux/brcm63xx/dts/gw6000.dts index 063bc6b24b..73d59b9470 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 = ; + debounce-interval = <60>; }; }; }; diff --git a/target/linux/brcm63xx/dts/gw6200.dts b/target/linux/brcm63xx/dts/gw6200.dts index 51f2947264..951cb5595b 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/hg520v.dts b/target/linux/brcm63xx/dts/hg520v.dts index 0a809c163f..4473362c5a 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/hg553.dts b/target/linux/brcm63xx/dts/hg553.dts index 36e6d8c332..c23dba00e6 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 = ; + debounce-interval = <60>; }; reset { label = "reset"; gpios = <&pinctrl 37 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/hg556a-a.dts b/target/linux/brcm63xx/dts/hg556a-a.dts index 71ae3deafa..7c935208b4 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 = ; + debounce-interval = <60>; }; + wlan { label = "wlan"; gpios = <&pinctrl 9 1>; linux,code = ; + debounce-interval = <60>; }; + restart { label = "restart"; gpios = <&pinctrl 10 1>; linux,code = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 11 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/hg556a-b.dts b/target/linux/brcm63xx/dts/hg556a-b.dts index 203ca995ac..a66dba6c4c 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 = ; + debounce-interval = <60>; }; + wlan { label = "wlan"; gpios = <&pinctrl 9 1>; linux,code = ; + debounce-interval = <60>; }; + restart { label = "restart"; gpios = <&pinctrl 10 1>; linux,code = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 11 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/hg556a-c.dts b/target/linux/brcm63xx/dts/hg556a-c.dts index 90cc8a507c..cfcc70a80d 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 = ; + debounce-interval = <60>; }; + wlan { label = "wlan"; gpios = <&pinctrl 9 1>; linux,code = ; + debounce-interval = <60>; }; + restart { label = "restart"; gpios = <&pinctrl 10 1>; linux,code = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 11 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/hg622.dts b/target/linux/brcm63xx/dts/hg622.dts index f34009a28f..de4a5cb622 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/hg655b.dts b/target/linux/brcm63xx/dts/hg655b.dts index 6766b43eca..28b2ed11c0 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 = ; + debounce-interval = <60>; }; + wlan { label = "wlan"; gpios = <&pinctrl 23 1>; linux,code = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 34 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/homehub2a.dts b/target/linux/brcm63xx/dts/homehub2a.dts index dfc3f1380b..59efb774fe 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 = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 9 1>; linux,code = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 11 1>; linux,code = ; + debounce-interval = <60>; }; }; }; diff --git a/target/linux/brcm63xx/dts/livebox-blue-5g.dts b/target/linux/brcm63xx/dts/livebox-blue-5g.dts index f8d5dfce5b..6eba3b8551 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 = ; + debounce-interval = <60>; }; button2 { label = "2"; gpios = <&pinctrl 7 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts index 76c55b4fd0..b9836fd3f1 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 = ; + debounce-interval = <60>; }; + clip { label = "clip"; gpios = <&pinctrl 31 1>; linux,code = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 34 1>; linux,code = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 37 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/nb4-ser-r0.dts b/target/linux/brcm63xx/dts/nb4-ser-r0.dts index 09b34cc9de..b546dae96d 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 = ; + debounce-interval = <60>; }; + clip { label = "clip"; gpios = <&pinctrl 31 1>; linux,code = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 34 1>; linux,code = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 37 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/nb6-ser-r0.dts b/target/linux/brcm63xx/dts/nb6-ser-r0.dts index 5ebfca6fb4..d91f1ebfec 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 = ; + debounce-interval = <60>; }; + wlan { label = "wlan"; gpios = <&pinctrl 12 1>; linux,code = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 24 1>; linux,code = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 25 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts index 20d820bd18..504817c3ea 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 = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 36 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/r1000h.dts b/target/linux/brcm63xx/dts/r1000h.dts index 9434060da1..22be696b60 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 = ; + debounce-interval = <60>; }; wps { label = "wps"; gpios = <&pinctrl 35 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/r5010unv2.dts b/target/linux/brcm63xx/dts/r5010unv2.dts index af9633c8b8..8f1142d82f 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 = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 24 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/rta770bw.dts b/target/linux/brcm63xx/dts/rta770bw.dts index fd99780f88..17d3cf95d6 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/rta770w.dts b/target/linux/brcm63xx/dts/rta770w.dts index e057a70ed8..09b27e41c7 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/spw303v.dts b/target/linux/brcm63xx/dts/spw303v.dts index 3317fc85eb..5edab551fd 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 = ; + debounce-interval = <60>; }; + ses { label = "ses"; gpios = <&pinctrl 37 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/spw500v.dts b/target/linux/brcm63xx/dts/spw500v.dts index c55fdf8402..246102116c 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/sr102.dts b/target/linux/brcm63xx/dts/sr102.dts index e34a681692..f5d9044b80 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/td-w8900gb.dts b/target/linux/brcm63xx/dts/td-w8900gb.dts index 513c40ac66..cb538115fa 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/v2110.dts b/target/linux/brcm63xx/dts/v2110.dts index a400d5ab9a..dd66b00825 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/v2500v-bb.dts b/target/linux/brcm63xx/dts/v2500v-bb.dts index 7d47683baf..5376d18e51 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/vg50.dts b/target/linux/brcm63xx/dts/vg50.dts index 140213b583..97b4275dff 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 = ; + debounce-interval = <60>; }; wps { label = "wps"; gpios = <&pinctrl 34 0>; linux,code = ; + debounce-interval = <60>; }; }; }; diff --git a/target/linux/brcm63xx/dts/vh4032n.dts b/target/linux/brcm63xx/dts/vh4032n.dts index 1296fbf14b..6788026d62 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 = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 35 1>; linux,code = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/vr-3025u.dts b/target/linux/brcm63xx/dts/vr-3025u.dts index 126ca94fa7..765433133d 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/vr-3025un.dts b/target/linux/brcm63xx/dts/vr-3025un.dts index 5e57036d02..139d79b4d3 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/vr-3026e.dts b/target/linux/brcm63xx/dts/vr-3026e.dts index 7439a2e62c..9d4fa5e693 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 = ; + debounce-interval = <60>; }; }; diff --git a/target/linux/brcm63xx/dts/wap-5813n.dts b/target/linux/brcm63xx/dts/wap-5813n.dts index 9a66895bd5..298d7791b2 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 = ; + debounce-interval = <60>; }; + reset { label = "reset"; gpios = <&pinctrl 34 1>; linux,code = ; + debounce-interval = <60>; }; + wps { label = "wps"; gpios = <&pinctrl 35 1>; linux,code = ; + debounce-interval = <60>; }; };