Gitiles
Code Review Sign In
192.168.1.100 / T108 / e958203796650e3959a43708d67534bf36f4c83b / . / target / linux / bcm53xx / patches-5.4 / 041-v6.0-0002-ARM-dts-broadcom-align-gpio-key-node-names-with-dtsc.patch
blob: 33d675297e3b65e6ea5c74d9a775a3d7b7f9c915 [file] [log] [blame]
b.liue9582032025-04-17 19:18:16 +0800[diff] [blame^]1From c5aec5611aec8fb1ca68f68e41acaefccfc93c16 Mon Sep 17 00:00:00 2001
2From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
3Date: Thu, 9 Jun 2022 13:39:30 +0200
4Subject: [PATCH] ARM: dts: broadcom: align gpio-key node names with dtschema
5
6The node names should be generic and DT schema expects certain pattern
7(e.g. with key/button/switch).
8
9Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
10Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
11---
12 arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 6 +++---
13 arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 8 ++++----
14 .../boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi | 10 +++++-----
15 arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 10 +++++-----
16 arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 4 ++--
17 arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | 4 ++--
18 arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 2 +-
19 arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 2 +-
20 arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 6 +++---
21 arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 6 +++---
22 arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 6 +++---
23 arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 4 ++--
24 arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 8 ++++----
25 arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 2 +-
26 arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 2 +-
27 arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 2 +-
28 arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 4 ++--
29 arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 4 ++--
30 arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 12 ++++++------
31 arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 4 ++--
32 arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 6 +++---
33 arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 8 ++++----
34 arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 4 ++--
35 arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 8 ++++----
36 arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 6 +++---
37 arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 6 +++---
38 arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 2 +-
39 arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 2 +-
40 arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 2 +-
41 arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 2 +-
42 arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 2 +-
43 arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 2 +-
44 arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 8 ++++----
45 arch/arm/boot/dts/bcm47094-phicomm-k3.dts | 2 +-
46 arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 2 +-
47 arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 2 +-
48 arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 6 +++---
49 arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 2 +-
50 arch/arm/boot/dts/bcm911360_entphn.dts | 4 ++--
51 arch/arm/boot/dts/bcm947189acdbmr.dts | 4 ++--
52 arch/arm/boot/dts/bcm953012er.dts | 4 ++--
53 arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi | 2 +-
54 arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi | 2 +-
55 43 files changed, 97 insertions(+), 97 deletions(-)
56
57--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
58+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
59@@ -70,19 +70,19 @@
60 gpio-keys {
61 compatible = "gpio-keys";
62
63- rfkill {
64+ button-rfkill {
65 label = "WiFi";
66 linux,code = <KEY_RFKILL>;
67 gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
68 };
69
70- restart {
71+ button-restart {
72 label = "Reset";
73 linux,code = <KEY_RESTART>;
74 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
75 };
76
77- wps {
78+ button-wps {
79 label = "WPS";
80 linux,code = <KEY_WPS_BUTTON>;
81 gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
82--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
83+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
84@@ -54,25 +54,25 @@
85 gpio-keys {
86 compatible = "gpio-keys";
87
88- brightness {
89+ button-brightness {
90 label = "Backlight";
91 linux,code = <KEY_BRIGHTNESS_ZERO>;
92 gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
93 };
94
95- wps {
96+ button-wps {
97 label = "WPS";
98 linux,code = <KEY_WPS_BUTTON>;
99 gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
100 };
101
102- restart {
103+ button-restart {
104 label = "Reset";
105 linux,code = <KEY_RESTART>;
106 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
107 };
108
109- rfkill {
110+ button-rfkill {
111 label = "WiFi";
112 linux,code = <KEY_RFKILL>;
113 gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
114--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
115+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
116@@ -104,33 +104,33 @@
117 gpio-keys {
118 compatible = "gpio-keys";
119
120- restart {
121+ button-restart {
122 label = "Reset";
123 linux,code = <KEY_RESTART>;
124 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
125 };
126
127- aoss {
128+ button-aoss {
129 label = "AOSS";
130 linux,code = <KEY_WPS_BUTTON>;
131 gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
132 };
133
134 /* Commit mode set by switch? */
135- mode {
136+ button-mode {
137 label = "Mode";
138 linux,code = <KEY_SETUP>;
139 gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
140 };
141
142 /* Switch: AP mode */
143- sw_ap {
144+ button-sw-ap {
145 label = "AP";
146 linux,code = <BTN_0>;
147 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
148 };
149
150- eject {
151+ button-eject {
152 label = "USB eject";
153 linux,code = <KEY_EJECTCD>;
154 gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
155--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
156+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
157@@ -100,33 +100,33 @@
158 gpio-keys {
159 compatible = "gpio-keys";
160
161- restart {
162+ button-restart {
163 label = "Reset";
164 linux,code = <KEY_RESTART>;
165 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
166 };
167
168- aoss {
169+ button-aoss {
170 label = "AOSS";
171 linux,code = <KEY_WPS_BUTTON>;
172 gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
173 };
174
175 /* Commit mode set by switch? */
176- mode {
177+ button-mode {
178 label = "Mode";
179 linux,code = <KEY_SETUP>;
180 gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
181 };
182
183 /* Switch: AP mode */
184- sw_ap {
185+ button-sw-ap {
186 label = "AP";
187 linux,code = <BTN_0>;
188 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
189 };
190
191- eject {
192+ button-eject {
193 label = "USB eject";
194 linux,code = <KEY_EJECTCD>;
195 gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
196--- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
197+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
198@@ -29,13 +29,13 @@
199 gpio-keys {
200 compatible = "gpio-keys";
201
202- wps {
203+ button-wps {
204 label = "WPS";
205 linux,code = <KEY_WPS_BUTTON>;
206 gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
207 };
208
209- restart {
210+ button-restart {
211 label = "Reset";
212 linux,code = <KEY_RESTART>;
213 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
214--- a/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
215+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
216@@ -25,13 +25,13 @@
217 gpio-keys {
218 compatible = "gpio-keys";
219
220- wps {
221+ button-wps {
222 label = "WPS";
223 linux,code = <KEY_WPS_BUTTON>;
224 gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
225 };
226
227- restart {
228+ button-restart {
229 label = "Reset";
230 linux,code = <KEY_RESTART>;
231 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
232--- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
233+++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
234@@ -45,7 +45,7 @@
235 gpio-keys {
236 compatible = "gpio-keys";
237
238- restart {
239+ button-restart {
240 label = "Reset";
241 linux,code = <KEY_RESTART>;
242 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
243--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
244+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
245@@ -52,7 +52,7 @@
246 gpio-keys {
247 compatible = "gpio-keys";
248
249- restart {
250+ button-restart {
251 label = "Reset";
252 linux,code = <KEY_RESTART>;
253 gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
254--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
255+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
256@@ -63,19 +63,19 @@
257 gpio-keys {
258 compatible = "gpio-keys";
259
260- wps {
261+ button-wps {
262 label = "WPS";
263 linux,code = <KEY_WPS_BUTTON>;
264 gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
265 };
266
267- rfkill {
268+ button-rfkill {
269 label = "WiFi";
270 linux,code = <KEY_RFKILL>;
271 gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
272 };
273
274- restart {
275+ button-restart {
276 label = "Reset";
277 linux,code = <KEY_RESTART>;
278 gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
279--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
280+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
281@@ -59,19 +59,19 @@
282 gpio-keys {
283 compatible = "gpio-keys";
284
285- wps {
286+ button-wps {
287 label = "WPS";
288 linux,code = <KEY_WPS_BUTTON>;
289 gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
290 };
291
292- rfkill {
293+ button-rfkill {
294 label = "WiFi";
295 linux,code = <KEY_RFKILL>;
296 gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
297 };
298
299- restart {
300+ button-restart {
301 label = "Reset";
302 linux,code = <KEY_RESTART>;
303 gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
304--- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
305+++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
306@@ -94,19 +94,19 @@
307 gpio-keys {
308 compatible = "gpio-keys";
309
310- rfkill {
311+ button-rfkill {
312 label = "WiFi";
313 linux,code = <KEY_RFKILL>;
314 gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
315 };
316
317- wps {
318+ button-wps {
319 label = "WPS";
320 linux,code = <KEY_WPS_BUTTON>;
321 gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
322 };
323
324- restart {
325+ button-restart {
326 label = "Reset";
327 linux,code = <KEY_RESTART>;
328 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
329--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
330+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
331@@ -60,13 +60,13 @@
332 gpio-keys {
333 compatible = "gpio-keys";
334
335- restart {
336+ button-restart {
337 label = "Reset";
338 linux,code = <KEY_RESTART>;
339 gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
340 };
341
342- wps {
343+ button-wps {
344 label = "WPS";
345 linux,code = <KEY_WPS_BUTTON>;
346 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
347--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
348+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
349@@ -91,26 +91,26 @@
350 gpio-keys {
351 compatible = "gpio-keys";
352
353- aoss {
354+ button-aoss {
355 label = "AOSS";
356 linux,code = <KEY_WPS_BUTTON>;
357 gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
358 };
359
360- restart {
361+ button-restart {
362 label = "Reset";
363 linux,code = <KEY_RESTART>;
364 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
365 };
366
367 /* Switch device mode? */
368- mode {
369+ button-mode {
370 label = "Mode";
371 linux,code = <KEY_SETUP>;
372 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
373 };
374
375- eject {
376+ button-eject {
377 label = "USB eject";
378 linux,code = <KEY_EJECTCD>;
379 gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
380--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
381+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
382@@ -96,7 +96,7 @@
383 gpio-keys {
384 compatible = "gpio-keys";
385
386- restart {
387+ button-restart {
388 label = "Reset";
389 linux,code = <KEY_RESTART>;
390 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
391--- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
392+++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
393@@ -45,7 +45,7 @@
394 gpio-keys {
395 compatible = "gpio-keys";
396
397- restart {
398+ button-restart {
399 label = "Reset";
400 linux,code = <KEY_RESTART>;
401 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
402--- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
403+++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
404@@ -94,7 +94,7 @@
405 gpio-keys {
406 compatible = "gpio-keys";
407
408- restart {
409+ button-restart {
410 label = "Reset";
411 linux,code = <KEY_RESTART>;
412 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
413--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
414+++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
415@@ -77,13 +77,13 @@
416 gpio-keys {
417 compatible = "gpio-keys";
418
419- rfkill {
420+ button-rfkill {
421 label = "WiFi";
422 linux,code = <KEY_RFKILL>;
423 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
424 };
425
426- restart {
427+ button-restart {
428 label = "Reset";
429 linux,code = <KEY_RESTART>;
430 gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
431--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
432+++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
433@@ -50,13 +50,13 @@
434 #address-cells = <1>;
435 #size-cells = <0>;
436
437- wps {
438+ button-wps {
439 label = "WPS";
440 linux,code = <KEY_WPS_BUTTON>;
441 gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
442 };
443
444- restart {
445+ button-restart {
446 label = "Reset";
447 linux,code = <KEY_RESTART>;
448 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
449--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
450+++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
451@@ -80,39 +80,39 @@
452 #address-cells = <1>;
453 #size-cells = <0>;
454
455- power {
456+ button-power {
457 label = "Power";
458 linux,code = <KEY_POWER>;
459 gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
460 };
461
462- restart {
463+ button-restart {
464 label = "Reset";
465 linux,code = <KEY_RESTART>;
466 gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
467 };
468
469- aoss {
470+ button-aoss {
471 label = "AOSS";
472 linux,code = <KEY_WPS_BUTTON>;
473 gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>;
474 };
475
476 /* Commit mode set by switch? */
477- mode {
478+ button-mode {
479 label = "Mode";
480 linux,code = <KEY_SETUP>;
481 gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
482 };
483
484 /* Switch: AP mode */
485- sw_ap {
486+ button-sw-ap {
487 label = "AP";
488 linux,code = <BTN_0>;
489 gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
490 };
491
492- eject {
493+ button-eject {
494 label = "USB eject";
495 linux,code = <KEY_EJECTCD>;
496 gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
497--- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
498+++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
499@@ -32,13 +32,13 @@
500 #address-cells = <1>;
501 #size-cells = <0>;
502
503- wps {
504+ button-wps {
505 label = "WPS";
506 linux,code = <KEY_WPS_BUTTON>;
507 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
508 };
509
510- restart {
511+ button-restart {
512 label = "Reset";
513 linux,code = <KEY_RESTART>;
514 gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
515--- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
516+++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
517@@ -75,19 +75,19 @@
518 #address-cells = <1>;
519 #size-cells = <0>;
520
521- wps {
522+ button-wps {
523 label = "WPS";
524 linux,code = <KEY_WPS_BUTTON>;
525 gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
526 };
527
528- rfkill {
529+ button-rfkill {
530 label = "WiFi";
531 linux,code = <KEY_RFKILL>;
532 gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
533 };
534
535- restart {
536+ button-restart {
537 label = "Reset";
538 linux,code = <KEY_RESTART>;
539 gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
540--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
541+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
542@@ -102,25 +102,25 @@
543 #address-cells = <1>;
544 #size-cells = <0>;
545
546- rfkill {
547+ button-rfkill {
548 label = "WiFi";
549 linux,code = <KEY_RFKILL>;
550 gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
551 };
552
553- wps {
554+ button-wps {
555 label = "WPS";
556 linux,code = <KEY_WPS_BUTTON>;
557 gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
558 };
559
560- restart {
561+ button-restart {
562 label = "Reset";
563 linux,code = <KEY_RESTART>;
564 gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
565 };
566
567- brightness {
568+ button-brightness {
569 label = "Backlight";
570 linux,code = <KEY_BRIGHTNESS_ZERO>;
571 gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>;
572--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
573+++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
574@@ -80,13 +80,13 @@
575 #address-cells = <1>;
576 #size-cells = <0>;
577
578- wps {
579+ button-wps {
580 label = "WPS";
581 linux,code = <KEY_WPS_BUTTON>;
582 gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
583 };
584
585- restart {
586+ button-restart {
587 label = "Reset";
588 linux,code = <KEY_RESTART>;
589 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
590--- a/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
591+++ b/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
592@@ -72,25 +72,25 @@
593 gpio-keys {
594 compatible = "gpio-keys";
595
596- wps {
597+ button-wps {
598 label = "WPS";
599 linux,code = <KEY_WPS_BUTTON>;
600 gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
601 };
602
603- reset {
604+ button-reset {
605 label = "Reset";
606 linux,code = <KEY_RESTART>;
607 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
608 };
609
610- wifi {
611+ button-wifi {
612 label = "Wi-Fi";
613 linux,code = <KEY_RFKILL>;
614 gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
615 };
616
617- led {
618+ button-led {
619 label = "Backlight";
620 linux,code = <KEY_BRIGHTNESS_ZERO>;
621 gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
622--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
623+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
624@@ -86,20 +86,20 @@
625 gpio-keys {
626 compatible = "gpio-keys";
627
628- wps {
629+ button-wps {
630 label = "WPS";
631 linux,code = <KEY_WPS_BUTTON>;
632 gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
633 };
634
635 /* Switch: router / extender */
636- extender {
637+ button-extender {
638 label = "Extender";
639 linux,code = <BTN_0>;
640 gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
641 };
642
643- restart {
644+ button-restart {
645 label = "Reset";
646 linux,code = <KEY_RESTART>;
647 gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
648--- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
649+++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
650@@ -30,19 +30,19 @@
651 gpio-keys {
652 compatible = "gpio-keys";
653
654- wps {
655+ button-wps {
656 label = "WPS";
657 linux,code = <KEY_WPS_BUTTON>;
658 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
659 };
660
661- rfkill {
662+ button-rfkill {
663 label = "WiFi";
664 linux,code = <KEY_RFKILL>;
665 gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>;
666 };
667
668- reset {
669+ button-reset {
670 label = "Reset";
671 linux,code = <KEY_RESTART>;
672 gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
673--- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
674+++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
675@@ -49,7 +49,7 @@
676 gpio-keys {
677 compatible = "gpio-keys";
678
679- restart {
680+ button-restart {
681 label = "Reset";
682 linux,code = <KEY_RESTART>;
683 gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
684--- a/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
685+++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
686@@ -43,7 +43,7 @@
687 gpio-keys {
688 compatible = "gpio-keys";
689
690- restart {
691+ button-restart {
692 label = "Reset";
693 linux,code = <KEY_RESTART>;
694 gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
695--- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
696+++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
697@@ -49,7 +49,7 @@
698 gpio-keys {
699 compatible = "gpio-keys";
700
701- restart {
702+ button-restart {
703 label = "Reset";
704 linux,code = <KEY_RESTART>;
705 gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
706--- a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
707+++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
708@@ -37,7 +37,7 @@
709 #address-cells = <1>;
710 #size-cells = <0>;
711
712- restart {
713+ button-restart {
714 label = "Reset";
715 linux,code = <KEY_RESTART>;
716 gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>;
717--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
718+++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
719@@ -89,7 +89,7 @@
720 gpio-keys {
721 compatible = "gpio-keys";
722
723- restart {
724+ button-restart {
725 label = "Reset";
726 linux,code = <KEY_RESTART>;
727 gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
728--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
729+++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
730@@ -67,7 +67,7 @@
731 gpio-keys {
732 compatible = "gpio-keys";
733
734- restart {
735+ button-restart {
736 label = "Reset";
737 linux,code = <KEY_RESTART>;
738 gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
739--- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
740+++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
741@@ -65,25 +65,25 @@
742 gpio-keys {
743 compatible = "gpio-keys";
744
745- brightness {
746+ button-brightness {
747 label = "Backlight";
748 linux,code = <KEY_BRIGHTNESS_ZERO>;
749 gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
750 };
751
752- restart {
753+ button-restart {
754 label = "Reset";
755 linux,code = <KEY_RESTART>;
756 gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
757 };
758
759- wps {
760+ button-wps {
761 label = "WPS";
762 linux,code = <KEY_WPS_BUTTON>;
763 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
764 };
765
766- rfkill {
767+ button-rfkill {
768 label = "WiFi";
769 linux,code = <KEY_RFKILL>;
770 gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
771--- a/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
772+++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
773@@ -22,7 +22,7 @@
774 gpio-keys {
775 compatible = "gpio-keys";
776
777- restart {
778+ button-restart {
779 label = "Reset";
780 linux,code = <KEY_RESTART>;
781 gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
782--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
783+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
784@@ -39,7 +39,7 @@
785 gpio-keys {
786 compatible = "gpio-keys";
787
788- restart {
789+ button-restart {
790 label = "Reset";
791 linux,code = <KEY_RESTART>;
792 gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
793--- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
794+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
795@@ -49,7 +49,7 @@
796 gpio-keys {
797 compatible = "gpio-keys";
798
799- restart {
800+ button-restart {
801 label = "Reset";
802 linux,code = <KEY_RESTART>;
803 gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
804--- a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
805+++ b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
806@@ -59,19 +59,19 @@
807 gpio-keys {
808 compatible = "gpio-keys";
809
810- rfkill {
811+ button-rfkill {
812 label = "WiFi";
813 linux,code = <KEY_RFKILL>;
814 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
815 };
816
817- restart {
818+ button-restart {
819 label = "Reset";
820 linux,code = <KEY_RESTART>;
821 gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
822 };
823
824- wps {
825+ button-wps {
826 label = "WPS";
827 linux,code = <KEY_WPS_BUTTON>;
828 gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
829--- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
830+++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
831@@ -50,7 +50,7 @@
832 #address-cells = <1>;
833 #size-cells = <0>;
834
835- restart {
836+ button-restart {
837 label = "Reset";
838 linux,code = <KEY_RESTART>;
839 gpios = <&chipcommon 21 GPIO_ACTIVE_LOW>;
840--- a/arch/arm/boot/dts/bcm911360_entphn.dts
841+++ b/arch/arm/boot/dts/bcm911360_entphn.dts
842@@ -47,10 +47,10 @@
843 stdout-path = "serial0:115200n8";
844 };
845
846- gpio_keys {
847+ gpio-keys {
848 compatible = "gpio-keys";
849
850- hook {
851+ button-hook {
852 label = "HOOK";
853 linux,code = <KEY_O>;
854 gpios = <&gpio_asiu 48 0>;
855--- a/arch/arm/boot/dts/bcm947189acdbmr.dts
856+++ b/arch/arm/boot/dts/bcm947189acdbmr.dts
857@@ -44,13 +44,13 @@
858 gpio-keys {
859 compatible = "gpio-keys";
860
861- restart {
862+ button-restart {
863 label = "Reset";
864 linux,code = <KEY_RESTART>;
865 gpios = <&chipcommon 7 GPIO_ACTIVE_HIGH>;
866 };
867
868- wps {
869+ button-wps {
870 label = "WPS";
871 linux,code = <KEY_WPS_BUTTON>;
872 gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
873--- a/arch/arm/boot/dts/bcm953012er.dts
874+++ b/arch/arm/boot/dts/bcm953012er.dts
875@@ -47,13 +47,13 @@
876 gpio-keys {
877 compatible = "gpio-keys";
878
879- wps {
880+ button-wps {
881 label = "WPS";
882 linux,code = <KEY_WPS_BUTTON>;
883 gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
884 };
885
886- restart {
887+ button-restart {
888 label = "Reset";
889 linux,code = <KEY_RESTART>;
890 gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
891--- a/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
892+++ b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
893@@ -13,7 +13,7 @@
894 autorepeat;
895 poll-interval = <20>;
896
897- reset {
898+ button-reset {
899 label = "reset";
900 linux,code = <KEY_RESTART>;
901 gpios = <&gpioa 8 GPIO_ACTIVE_LOW>;
902--- a/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi
903+++ b/arch/arm/boot/dts/bcm958625-meraki-kingpin.dtsi
904@@ -14,7 +14,7 @@
905 autorepeat;
906 poll-interval = <20>;
907
908- reset {
909+ button-reset {
910 label = "reset";
911 linux,code = <KEY_RESTART>;
912 gpios = <&gpioa 6 GPIO_ACTIVE_LOW>;