Gitiles
Code Review Sign In
192.168.1.100 / T108 / c8c95bbfb63cd52cb22cbf538f33b9fc96a99ee3 / . / target / linux / bcm53xx / patches-5.4 / 042-v6.2-0004-ARM-dts-broadcom-align-LED-node-names-with-dtschema.patch
blob: d6bf49d0cd212715ffeb5a619bcc288bf452ba7b [file] [log] [blame]
b.liue9582032025-04-17 19:18:16 +0800[diff] [blame]1From af84101e3f2258a303fa2461ebec0878ce23ea10 Mon Sep 17 00:00:00 2001
2From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
3Date: Fri, 25 Nov 2022 15:41:27 +0100
4Subject: [PATCH] ARM: dts: broadcom: align LED node names with dtschema
5
6The node names should be generic and DT schema expects certain pattern:
7
8 bcm4708-asus-rt-ac68u.dtb: leds: 'logo', 'power', 'usb2', 'usb3' do not match any of the regexes: '(^led-[0-9a-f]$|led)', 'pinctrl-[0-9]+'
9
10Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
11Link: https://lore.kernel.org/r/20221125144128.477059-1-krzysztof.kozlowski@linaro.org
12Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
13---
14 arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 15 +++++-----
15 arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 8 +++---
16 .../bcm4708-buffalo-wzr-1166dhp-common.dtsi | 16 +++++------
17 .../boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 16 +++++------
18 arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 6 ++--
19 arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 2 +-
20 arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 10 +++----
21 .../arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 10 +++----
22 arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 22 +++++++--------
23 arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 10 +++----
24 .../boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 14 +++++-----
25 .../boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 16 +++++------
26 arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 6 ++--
27 arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 20 ++++++-------
28 .../boot/dts/bcm47081-tplink-archer-c5-v2.dts | 18 ++++++------
29 arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 6 ++--
30 .../boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 18 ++++++------
31 arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 16 +++++------
32 arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 22 +++++++--------
33 .../boot/dts/bcm4709-tplink-archer-c9-v1.dts | 18 ++++++------
34 arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts | 12 ++++----
35 arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 14 +++++-----
36 arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts | 16 +++++------
37 .../boot/dts/bcm47094-linksys-panamera.dts | 28 +++++++++----------
38 arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 4 +--
39 arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 6 ++--
40 arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 4 +--
41 arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 2 +-
42 arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 20 ++++++-------
43 .../boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 10 +++----
44 arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 14 +++++-----
45 arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts | 4 +--
46 arch/arm/boot/dts/bcm47189-luxul-xap-810.dts | 10 +++----
47 arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 14 +++++-----
48 .../boot/dts/bcm53016-dlink-dwl-8610ap.dts | 8 +++---
49 arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 6 ++--
50 arch/arm/boot/dts/bcm947189acdbmr.dts | 6 ++--
51 37 files changed, 223 insertions(+), 224 deletions(-)
52
53--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
54+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
55@@ -28,40 +28,39 @@
56 leds {
57 compatible = "gpio-leds";
58
59- usb3 {
60+ led-usb3 {
61 label = "bcm53xx:blue:usb3";
62 gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
63 };
64
65- wan {
66+ led-wan {
67 label = "bcm53xx:blue:wan";
68 gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
69 };
70
71- lan {
72+ led-lan {
73 label = "bcm53xx:blue:lan";
74 gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
75 };
76
77- power {
78+ led-power {
79 label = "bcm53xx:blue:power";
80 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
81 linux,default-trigger = "default-on";
82 };
83
84- all {
85+ led-all {
86 label = "bcm53xx:blue:all";
87 gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
88 linux,default-trigger = "default-on";
89 };
90
91- 2ghz {
92+ led-2ghz {
93 label = "bcm53xx:blue:2ghz";
94 gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
95 };
96
97-
98- usb2 {
99+ led-usb2 {
100 label = "bcm53xx:blue:usb2";
101 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
102 };
103--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
104+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
105@@ -28,24 +28,24 @@
106 leds {
107 compatible = "gpio-leds";
108
109- usb2 {
110+ led-usb2 {
111 label = "bcm53xx:blue:usb2";
112 gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
113 };
114
115- power {
116+ led-power {
117 label = "bcm53xx:blue:power";
118 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
119 linux,default-trigger = "default-on";
120 };
121
122- logo {
123+ led-logo {
124 label = "bcm53xx:white:logo";
125 gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
126 linux,default-trigger = "default-on";
127 };
128
129- usb3 {
130+ led-usb3 {
131 label = "bcm53xx:blue:usb3";
132 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
133 };
134--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
135+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
136@@ -37,7 +37,7 @@
137 leds {
138 compatible = "gpio-leds";
139
140- usb {
141+ led-usb {
142 /* label = "bcm53xx:blue:usb"; */
143 function = LED_FUNCTION_USB;
144 color = <LED_COLOR_ID_BLUE>;
145@@ -48,14 +48,14 @@
146 linux,default-trigger = "usbport";
147 };
148
149- power0 {
150+ led-power0 {
151 /* label = "bcm53xx:red:power"; */
152 function = LED_FUNCTION_FAULT;
153 color = <LED_COLOR_ID_RED>;
154 gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
155 };
156
157- power1 {
158+ led-power1 {
159 /* label = "bcm53xx:white:power"; */
160 function = LED_FUNCTION_POWER;
161 color = <LED_COLOR_ID_WHITE>;
162@@ -63,7 +63,7 @@
163 linux,default-trigger = "default-on";
164 };
165
166- router0 {
167+ led-router0 {
168 /* label = "bcm53xx:blue:router"; */
169 function = LED_FUNCTION_STATUS;
170 color = <LED_COLOR_ID_BLUE>;
171@@ -71,14 +71,14 @@
172 linux,default-trigger = "default-on";
173 };
174
175- router1 {
176+ led-router1 {
177 /* label = "bcm53xx:amber:router"; */
178 function = LED_FUNCTION_STATUS;
179 color = <LED_COLOR_ID_AMBER>;
180 gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
181 };
182
183- wan {
184+ led-wan {
185 /* label = "bcm53xx:blue:wan"; */
186 function = LED_FUNCTION_WAN;
187 color = <LED_COLOR_ID_BLUE>;
188@@ -86,14 +86,14 @@
189 linux,default-trigger = "default-on";
190 };
191
192- wireless0 {
193+ led-wireless0 {
194 /* label = "bcm53xx:blue:wireless"; */
195 function = LED_FUNCTION_WLAN;
196 color = <LED_COLOR_ID_BLUE>;
197 gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
198 };
199
200- wireless1 {
201+ led-wireless1 {
202 /* label = "bcm53xx:amber:wireless"; */
203 function = LED_FUNCTION_WLAN;
204 color = <LED_COLOR_ID_AMBER>;
205--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
206+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
207@@ -49,7 +49,7 @@
208 leds {
209 compatible = "gpio-leds";
210
211- usb {
212+ led-usb {
213 label = "bcm53xx:blue:usb";
214 gpios = <&hc595 0 GPIO_ACTIVE_HIGH>;
215 trigger-sources = <&ohci_port1>, <&ehci_port1>,
216@@ -58,40 +58,40 @@
217 linux,default-trigger = "usbport";
218 };
219
220- power0 {
221+ led-power0 {
222 label = "bcm53xx:red:power";
223 gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
224 };
225
226- power1 {
227+ led-power1 {
228 label = "bcm53xx:white:power";
229 gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
230 linux,default-trigger = "default-on";
231 };
232
233- router0 {
234+ led-router0 {
235 label = "bcm53xx:blue:router";
236 gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
237 linux,default-trigger = "default-on";
238 };
239
240- router1 {
241+ led-router1 {
242 label = "bcm53xx:amber:router";
243 gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
244 };
245
246- wan {
247+ led-wan {
248 label = "bcm53xx:blue:wan";
249 gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
250 linux,default-trigger = "default-on";
251 };
252
253- wireless0 {
254+ led-wireless0 {
255 label = "bcm53xx:blue:wireless";
256 gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
257 };
258
259- wireless1 {
260+ led-wireless1 {
261 label = "bcm53xx:amber:wireless";
262 gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
263 };
264--- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
265+++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
266@@ -23,19 +23,19 @@
267 leds {
268 compatible = "gpio-leds";
269
270- 5ghz {
271+ led-5ghz {
272 label = "bcm53xx:blue:5ghz";
273 gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
274 linux,default-trigger = "none";
275 };
276
277- 2ghz {
278+ led-2ghz {
279 label = "bcm53xx:blue:2ghz";
280 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
281 linux,default-trigger = "none";
282 };
283
284- status {
285+ led-status {
286 label = "bcm53xx:green:status";
287 gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
288 linux,default-trigger = "timer";
289--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
290+++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
291@@ -42,7 +42,7 @@
292 leds {
293 compatible = "gpio-leds";
294
295- status {
296+ led-status {
297 label = "bcm53xx:green:status";
298 gpios = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
299 linux,default-trigger = "timer";
300--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
301+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
302@@ -29,24 +29,24 @@
303 leds {
304 compatible = "gpio-leds";
305
306- logo {
307+ led-logo {
308 label = "bcm53xx:white:logo";
309 gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
310 linux,default-trigger = "default-on";
311 };
312
313- power0 {
314+ led-power0 {
315 label = "bcm53xx:green:power";
316 gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
317 linux,default-trigger = "default-on";
318 };
319
320- power1 {
321+ led-power1 {
322 label = "bcm53xx:amber:power";
323 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
324 };
325
326- usb {
327+ led-usb {
328 label = "bcm53xx:blue:usb";
329 gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
330 trigger-sources = <&ohci_port1>, <&ehci_port1>,
331@@ -54,7 +54,7 @@
332 linux,default-trigger = "usbport";
333 };
334
335- wireless {
336+ led-wireless {
337 label = "bcm53xx:blue:wireless";
338 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
339 };
340--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
341+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
342@@ -28,29 +28,29 @@
343 leds {
344 compatible = "gpio-leds";
345
346- logo {
347+ led-logo {
348 label = "bcm53xx:white:logo";
349 gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
350 linux,default-trigger = "default-on";
351 };
352
353- power0 {
354+ led-power0 {
355 label = "bcm53xx:green:power";
356 gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
357 };
358
359- power1 {
360+ led-power1 {
361 label = "bcm53xx:amber:power";
362 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
363 linux,default-trigger = "default-on";
364 };
365
366- usb {
367+ led-usb {
368 label = "bcm53xx:blue:usb";
369 gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
370 };
371
372- wireless {
373+ led-wireless {
374 label = "bcm53xx:blue:wireless";
375 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
376 };
377--- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
378+++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
379@@ -28,64 +28,64 @@
380 leds {
381 compatible = "gpio-leds";
382
383- power-white {
384+ led-power-white {
385 label = "bcm53xx:white:power";
386 gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
387 linux,default-trigger = "default-on";
388 };
389
390- power-amber {
391+ led-power-amber {
392 label = "bcm53xx:amber:power";
393 gpios = <&chipcommon 2 GPIO_ACTIVE_HIGH>;
394 };
395
396- usb2 {
397+ led-usb2 {
398 label = "bcm53xx:white:usb2";
399 gpios = <&chipcommon 3 GPIO_ACTIVE_HIGH>;
400 trigger-sources = <&ohci_port2>, <&ehci_port2>;
401 linux,default-trigger = "usbport";
402 };
403
404- usb3-white {
405+ led-usb3-white {
406 label = "bcm53xx:white:usb3";
407 gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
408 trigger-sources = <&xhci_port1>;
409 linux,default-trigger = "usbport";
410 };
411
412- usb3-green {
413+ led-usb3-green {
414 label = "bcm53xx:green:usb3";
415 gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
416 trigger-sources = <&ohci_port1>, <&ehci_port1>;
417 linux,default-trigger = "usbport";
418 };
419
420- wps {
421+ led-wps {
422 label = "bcm53xx:white:wps";
423 gpios = <&chipcommon 6 GPIO_ACTIVE_HIGH>;
424 };
425
426- status-red {
427+ led-status-red {
428 label = "bcm53xx:red:status";
429 gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>;
430 };
431
432- status-green {
433+ led-status-green {
434 label = "bcm53xx:green:status";
435 gpios = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
436 };
437
438- status-blue {
439+ led-status-blue {
440 label = "bcm53xx:blue:status";
441 gpios = <&chipcommon 10 GPIO_ACTIVE_HIGH>;
442 };
443
444- wan-white {
445+ led-wan-white {
446 label = "bcm53xx:white:wan";
447 gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
448 };
449
450- wan-red {
451+ led-wan-red {
452 label = "bcm53xx:red:wan";
453 gpios = <&chipcommon 13 GPIO_ACTIVE_HIGH>;
454 };
455--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
456+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
457@@ -28,30 +28,30 @@
458 leds {
459 compatible = "gpio-leds";
460
461- power {
462+ led-power {
463 label = "bcm53xx:blue:power";
464 gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
465 linux,default-trigger = "default-on";
466 };
467
468- usb2 {
469+ led-usb2 {
470 label = "bcm53xx:blue:usb2";
471 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
472 };
473
474- wan {
475+ led-wan {
476 label = "bcm53xx:blue:wan";
477 gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
478 linux,default-trigger = "default-on";
479 };
480
481- lan {
482+ led-lan {
483 label = "bcm53xx:blue:lan";
484 gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
485 linux,default-trigger = "default-on";
486 };
487
488- usb3 {
489+ led-usb3 {
490 label = "bcm53xx:blue:usb3";
491 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
492 };
493--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
494+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
495@@ -49,40 +49,40 @@
496 leds {
497 compatible = "gpio-leds";
498
499- power0 {
500+ led-power0 {
501 label = "bcm53xx:green:power";
502 gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
503 linux,default-trigger = "default-on";
504 };
505
506- power1 {
507+ led-power1 {
508 label = "bcm53xx:red:power";
509 gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
510 };
511
512- router0 {
513+ led-router0 {
514 label = "bcm53xx:green:router";
515 gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
516 linux,default-trigger = "default-on";
517 };
518
519- router1 {
520+ led-router1 {
521 label = "bcm53xx:amber:router";
522 gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
523 };
524
525- wan {
526+ led-wan {
527 label = "bcm53xx:green:wan";
528 gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
529 linux,default-trigger = "default-on";
530 };
531
532- wireless0 {
533+ led-wireless0 {
534 label = "bcm53xx:green:wireless";
535 gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
536 };
537
538- wireless1 {
539+ led-wireless1 {
540 label = "bcm53xx:amber:wireless";
541 gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
542 };
543--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
544+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
545@@ -49,45 +49,45 @@
546 leds {
547 compatible = "gpio-leds";
548
549- usb {
550+ led-usb {
551 label = "bcm53xx:green:usb";
552 gpios = <&hc595 0 GPIO_ACTIVE_HIGH>;
553 };
554
555- power0 {
556+ led-power0 {
557 label = "bcm53xx:green:power";
558 gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
559 linux,default-trigger = "default-on";
560 };
561
562- power1 {
563+ led-power1 {
564 label = "bcm53xx:red:power";
565 gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
566 };
567
568- router0 {
569+ led-router0 {
570 label = "bcm53xx:green:router";
571 gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
572 linux,default-trigger = "default-on";
573 };
574
575- router1 {
576+ led-router1 {
577 label = "bcm53xx:amber:router";
578 gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
579 };
580
581- wan {
582+ led-wan {
583 label = "bcm53xx:green:wan";
584 gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
585 linux,default-trigger = "default-on";
586 };
587
588- wireless0 {
589+ led-wireless0 {
590 label = "bcm53xx:green:wireless";
591 gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
592 };
593
594- wireless1 {
595+ led-wireless1 {
596 label = "bcm53xx:amber:wireless";
597 gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
598 };
599--- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
600+++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
601@@ -23,19 +23,19 @@
602 leds {
603 compatible = "gpio-leds";
604
605- 5ghz {
606+ led-5ghz {
607 label = "bcm53xx:blue:5ghz";
608 gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
609 linux,default-trigger = "none";
610 };
611
612- 2ghz {
613+ led-2ghz {
614 label = "bcm53xx:blue:2ghz";
615 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
616 linux,default-trigger = "none";
617 };
618
619- status {
620+ led-status {
621 label = "bcm53xx:green:status";
622 gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
623 linux,default-trigger = "timer";
624--- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
625+++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
626@@ -29,62 +29,62 @@
627 leds {
628 compatible = "gpio-leds";
629
630- power {
631+ led-power {
632 label = "bcm53xx:green:power";
633 gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
634 linux,default-trigger = "default-on";
635 };
636
637- lan3 {
638+ led-lan3 {
639 label = "bcm53xx:green:lan3";
640 gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
641 linux,default-trigger = "none";
642 };
643
644- lan4 {
645+ led-lan4 {
646 label = "bcm53xx:green:lan4";
647 gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
648 linux,default-trigger = "none";
649 };
650
651- wan {
652+ led-wan {
653 label = "bcm53xx:green:wan";
654 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
655 linux,default-trigger = "none";
656 };
657
658- lan2 {
659+ led-lan2 {
660 label = "bcm53xx:green:lan2";
661 gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
662 linux,default-trigger = "none";
663 };
664
665- usb {
666+ led-usb {
667 label = "bcm53xx:green:usb";
668 gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
669 trigger-sources = <&ohci_port2>, <&ehci_port2>;
670 linux,default-trigger = "usbport";
671 };
672
673- status {
674+ led-status {
675 label = "bcm53xx:green:status";
676 gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
677 linux,default-trigger = "timer";
678 };
679
680- 2ghz {
681+ led-2ghz {
682 label = "bcm53xx:green:2ghz";
683 gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
684 linux,default-trigger = "none";
685 };
686
687- 5ghz {
688+ led-5ghz {
689 label = "bcm53xx:green:5ghz";
690 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
691 linux,default-trigger = "none";
692 };
693
694- lan1 {
695+ led-lan1 {
696 label = "bcm53xx:green:lan1";
697 gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
698 linux,default-trigger = "none";
699--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
700+++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
701@@ -23,50 +23,50 @@
702 leds {
703 compatible = "gpio-leds";
704
705- 2ghz {
706+ led-2ghz {
707 label = "bcm53xx:green:2ghz";
708 gpios = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
709 };
710
711- lan {
712+ led-lan {
713 label = "bcm53xx:green:lan";
714 gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
715 };
716
717- usb2-port1 {
718+ led-usb2-port1 {
719 label = "bcm53xx:green:usb2-port1";
720 gpios = <&chipcommon 2 GPIO_ACTIVE_HIGH>;
721 trigger-sources = <&ohci_port1>, <&ehci_port1>;
722 linux,default-trigger = "usbport";
723 };
724
725- power {
726+ led-power {
727 label = "bcm53xx:green:power";
728 gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
729 linux,default-trigger = "default-on";
730 };
731
732- wan-green {
733+ led-wan-green {
734 label = "bcm53xx:green:wan";
735 gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
736 };
737
738- wps {
739+ led-wps {
740 label = "bcm53xx:green:wps";
741 gpios = <&chipcommon 6 GPIO_ACTIVE_HIGH>;
742 };
743
744- wan-amber {
745+ led-wan-amber {
746 label = "bcm53xx:amber:wan";
747 gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>;
748 };
749
750- 5ghz {
751+ led-5ghz {
752 label = "bcm53xx:green:5ghz";
753 gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
754 };
755
756- usb2-port2 {
757+ led-usb2-port2 {
758 label = "bcm53xx:green:usb2-port2";
759 gpios = <&chipcommon 13 GPIO_ACTIVE_HIGH>;
760 trigger-sources = <&ohci_port2>, <&ehci_port2>;
761--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
762+++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
763@@ -28,18 +28,18 @@
764 leds {
765 compatible = "gpio-leds";
766
767- wps {
768+ led-wps {
769 label = "bcm53xx:blue:wps";
770 gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
771 };
772
773- power {
774+ led-power {
775 label = "bcm53xx:blue:power";
776 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
777 linux,default-trigger = "default-on";
778 };
779
780- wan {
781+ led-wan {
782 label = "bcm53xx:red:wan";
783 gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
784 };
785--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
786+++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
787@@ -28,48 +28,48 @@
788 leds {
789 compatible = "gpio-leds";
790
791- usb {
792+ led-usb {
793 label = "bcm53xx:green:usb";
794 gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
795 };
796
797- power-amber {
798+ led-power-amber {
799 label = "bcm53xx:amber:power";
800 gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
801 };
802
803- power-white {
804+ led-power-white {
805 label = "bcm53xx:white:power";
806 gpios = <&chipcommon 6 GPIO_ACTIVE_HIGH>;
807 linux,default-trigger = "default-on";
808 };
809
810- router-amber {
811+ led-router-amber {
812 label = "bcm53xx:amber:router";
813 gpios = <&chipcommon 7 GPIO_ACTIVE_HIGH>;
814 };
815
816- router-white {
817+ led-router-white {
818 label = "bcm53xx:white:router";
819 gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>;
820 };
821
822- wan-amber {
823+ led-wan-amber {
824 label = "bcm53xx:amber:wan";
825 gpios = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
826 };
827
828- wan-white {
829+ led-wan-white {
830 label = "bcm53xx:white:wan";
831 gpios = <&chipcommon 10 GPIO_ACTIVE_HIGH>;
832 };
833
834- wireless-amber {
835+ led-wireless-amber {
836 label = "bcm53xx:amber:wireless";
837 gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>;
838 };
839
840- wireless-white {
841+ led-wireless-white {
842 label = "bcm53xx:white:wireless";
843 gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
844 };
845--- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
846+++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
847@@ -28,43 +28,43 @@
848 leds {
849 compatible = "gpio-leds";
850
851- power-white {
852+ led-power-white {
853 label = "bcm53xx:white:power";
854 gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
855 linux,default-trigger = "default-on";
856 };
857
858- power-amber {
859+ led-power-amber {
860 label = "bcm53xx:amber:power";
861 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
862 };
863
864- 5ghz {
865+ led-5ghz {
866 label = "bcm53xx:white:5ghz";
867 gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
868 };
869
870- 2ghz {
871+ led-2ghz {
872 label = "bcm53xx:white:2ghz";
873 gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
874 };
875
876- wps {
877+ led-wps {
878 label = "bcm53xx:white:wps";
879 gpios = <&chipcommon 14 GPIO_ACTIVE_HIGH>;
880 };
881
882- wireless {
883+ led-wireless {
884 label = "bcm53xx:white:wireless";
885 gpios = <&chipcommon 15 GPIO_ACTIVE_HIGH>;
886 };
887
888- usb3 {
889+ led-usb3 {
890 label = "bcm53xx:white:usb3";
891 gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
892 };
893
894- usb2 {
895+ led-usb2 {
896 label = "bcm53xx:white:usb2";
897 gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
898 };
899--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
900+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
901@@ -39,59 +39,59 @@
902 leds {
903 compatible = "gpio-leds";
904
905- power-white {
906+ led-power-white {
907 label = "bcm53xx:white:power";
908 gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
909 linux,default-trigger = "default-on";
910 };
911
912- power-amber {
913+ led-power-amber {
914 label = "bcm53xx:amber:power";
915 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
916 };
917
918- wan-white {
919+ led-wan-white {
920 label = "bcm53xx:white:wan";
921 gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
922 linux,default-trigger = "default-on";
923 };
924
925- wan-amber {
926+ led-wan-amber {
927 label = "bcm53xx:amber:wan";
928 gpios = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
929 };
930
931- 5ghz-1 {
932+ led-5ghz-1 {
933 label = "bcm53xx:white:5ghz-1";
934 gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
935 };
936
937- 2ghz {
938+ led-2ghz {
939 label = "bcm53xx:white:2ghz";
940 gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
941 };
942
943- wireless {
944+ led-wireless {
945 label = "bcm53xx:white:wireless";
946 gpios = <&chipcommon 14 GPIO_ACTIVE_HIGH>;
947 };
948
949- wps {
950+ led-wps {
951 label = "bcm53xx:white:wps";
952 gpios = <&chipcommon 15 GPIO_ACTIVE_HIGH>;
953 };
954
955- 5ghz-2 {
956+ led-5ghz-2 {
957 label = "bcm53xx:white:5ghz-2";
958 gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>;
959 };
960
961- usb3 {
962+ led-usb3 {
963 label = "bcm53xx:white:usb3";
964 gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
965 };
966
967- usb2 {
968+ led-usb2 {
969 label = "bcm53xx:white:usb2";
970 gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
971 };
972--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
973+++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
974@@ -23,27 +23,27 @@
975 leds {
976 compatible = "gpio-leds";
977
978- lan {
979+ led-lan {
980 label = "bcm53xx:blue:lan";
981 gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
982 };
983
984- wps {
985+ led-wps {
986 label = "bcm53xx:blue:wps";
987 gpios = <&chipcommon 2 GPIO_ACTIVE_HIGH>;
988 };
989
990- 2ghz {
991+ led-2ghz {
992 label = "bcm53xx:blue:2ghz";
993 gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
994 };
995
996- 5ghz {
997+ led-5ghz {
998 label = "bcm53xx:blue:5ghz";
999 gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
1000 };
1001
1002- usb3 {
1003+ led-usb3 {
1004 label = "bcm53xx:blue:usb3";
1005 gpios = <&chipcommon 6 GPIO_ACTIVE_HIGH>;
1006 trigger-sources = <&ohci_port1>, <&ehci_port1>,
1007@@ -51,24 +51,24 @@
1008 linux,default-trigger = "usbport";
1009 };
1010
1011- usb2 {
1012+ led-usb2 {
1013 label = "bcm53xx:blue:usb2";
1014 gpios = <&chipcommon 7 GPIO_ACTIVE_HIGH>;
1015 trigger-sources = <&ohci_port2>, <&ehci_port2>;
1016 linux,default-trigger = "usbport";
1017 };
1018
1019- wan-blue {
1020+ led-wan-blue {
1021 label = "bcm53xx:blue:wan";
1022 gpios = <&chipcommon 14 GPIO_ACTIVE_HIGH>;
1023 };
1024
1025- wan-amber {
1026+ led-wan-amber {
1027 label = "bcm53xx:amber:wan";
1028 gpios = <&chipcommon 15 GPIO_ACTIVE_HIGH>;
1029 };
1030
1031- power {
1032+ led-power {
1033 label = "bcm53xx:blue:power";
1034 gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
1035 linux,default-trigger = "default-on";
1036--- a/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
1037+++ b/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
1038@@ -33,37 +33,37 @@
1039 leds {
1040 compatible = "gpio-leds";
1041
1042- power {
1043+ led-power {
1044 label = "white:power";
1045 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
1046 linux,default-trigger = "default-on";
1047 };
1048
1049- wan-red {
1050+ led-wan-red {
1051 label = "red:wan";
1052 gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
1053 };
1054
1055- lan {
1056+ led-lan {
1057 label = "white:lan";
1058 gpios = <&chipcommon 21 GPIO_ACTIVE_LOW>;
1059 };
1060
1061- usb2 {
1062+ led-usb2 {
1063 label = "white:usb2";
1064 gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>;
1065 trigger-sources = <&ehci_port2>;
1066 linux,default-trigger = "usbport";
1067 };
1068
1069- usb3 {
1070+ led-usb3 {
1071 label = "white:usb3";
1072 gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
1073 trigger-sources = <&ehci_port1>, <&xhci_port1>;
1074 linux,default-trigger = "usbport";
1075 };
1076
1077- wps {
1078+ led-wps {
1079 label = "white:wps";
1080 gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>;
1081 };
1082--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
1083+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
1084@@ -43,28 +43,28 @@
1085 leds {
1086 compatible = "gpio-leds";
1087
1088- power-white {
1089+ led-power-white {
1090 label = "bcm53xx:white:power";
1091 gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
1092 linux,default-trigger = "default-on";
1093 };
1094
1095- wan-white {
1096+ led-wan-white {
1097 label = "bcm53xx:white:wan";
1098 gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
1099 };
1100
1101- power-amber {
1102+ led-power-amber {
1103 label = "bcm53xx:amber:power";
1104 gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
1105 };
1106
1107- wan-amber {
1108+ led-wan-amber {
1109 label = "bcm53xx:amber:wan";
1110 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
1111 };
1112
1113- usb3-white {
1114+ led-usb3-white {
1115 label = "bcm53xx:white:usb3";
1116 gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
1117 trigger-sources = <&ohci_port1>, <&ehci_port1>,
1118@@ -72,12 +72,12 @@
1119 linux,default-trigger = "usbport";
1120 };
1121
1122- 2ghz {
1123+ led-2ghz {
1124 label = "bcm53xx:white:2ghz";
1125 gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
1126 };
1127
1128- 5ghz {
1129+ led-5ghz {
1130 label = "bcm53xx:white:5ghz";
1131 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
1132 };
1133--- a/arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts
1134+++ b/arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts
1135@@ -41,47 +41,47 @@
1136 */
1137 compatible = "gpio-leds";
1138
1139- power-white {
1140+ led-power-white {
1141 label = "bcm53xx:white:power";
1142 gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
1143 linux,default-trigger = "default-on";
1144 };
1145
1146- wan-white {
1147+ led-wan-white {
1148 label = "bcm53xx:white:wan";
1149 gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
1150 };
1151
1152- power-amber {
1153+ led-power-amber {
1154 label = "bcm53xx:amber:power";
1155 gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
1156 };
1157
1158- wan-amber {
1159+ led-wan-amber {
1160 label = "bcm53xx:amber:wan";
1161 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
1162 };
1163
1164- usb3-white {
1165+ led-usb3-white {
1166 label = "bcm53xx:white:usb3";
1167 gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
1168 trigger-sources = <&xhci_port1>;
1169 linux,default-trigger = "usbport";
1170 };
1171
1172- usb2-white {
1173+ led-usb2-white {
1174 label = "bcm53xx:white:usb2";
1175 gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
1176 trigger-sources = <&ohci_port1>, <&ehci_port1>;
1177 linux,default-trigger = "usbport";
1178 };
1179
1180- 2ghz {
1181+ led-2ghz {
1182 label = "bcm53xx:white:2ghz";
1183 gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
1184 };
1185
1186- 5ghz {
1187+ led-5ghz {
1188 label = "bcm53xx:white:5ghz";
1189 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
1190 };
1191--- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
1192+++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
1193@@ -52,19 +52,19 @@
1194 leds {
1195 compatible = "gpio-leds";
1196
1197- wps {
1198+ led-wps {
1199 label = "bcm53xx:white:wps";
1200 gpios = <&chipcommon 22 GPIO_ACTIVE_LOW>;
1201 };
1202
1203- usb2 {
1204+ led-usb2 {
1205 label = "bcm53xx:green:usb2";
1206 gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
1207 trigger-sources = <&ohci_port2>, <&ehci_port2>;
1208 linux,default-trigger = "usbport";
1209 };
1210
1211- usb3 {
1212+ led-usb3 {
1213 label = "bcm53xx:green:usb3";
1214 gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
1215 trigger-sources = <&ohci_port1>, <&ehci_port1>,
1216@@ -72,58 +72,58 @@
1217 linux,default-trigger = "usbport";
1218 };
1219
1220- power {
1221+ led-power {
1222 label = "bcm53xx:white:power";
1223 gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
1224 linux,default-trigger = "default-on";
1225 };
1226
1227- wifi-disabled {
1228+ led-wifi-disabled {
1229 label = "bcm53xx:amber:wifi-disabled";
1230 gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
1231 };
1232
1233- wifi-enabled {
1234+ led-wifi-enabled {
1235 label = "bcm53xx:white:wifi-enabled";
1236 gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
1237 };
1238
1239- bluebar1 {
1240+ led-bluebar1 {
1241 label = "bcm53xx:white:bluebar1";
1242 gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>;
1243 };
1244
1245- bluebar2 {
1246+ led-bluebar2 {
1247 label = "bcm53xx:white:bluebar2";
1248 gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
1249 };
1250
1251- bluebar3 {
1252+ led-bluebar3 {
1253 label = "bcm53xx:white:bluebar3";
1254 gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
1255 };
1256
1257- bluebar4 {
1258+ led-bluebar4 {
1259 label = "bcm53xx:white:bluebar4";
1260 gpios = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
1261 };
1262
1263- bluebar5 {
1264+ led-bluebar5 {
1265 label = "bcm53xx:white:bluebar5";
1266 gpios = <&chipcommon 19 GPIO_ACTIVE_HIGH>;
1267 };
1268
1269- bluebar6 {
1270+ led-bluebar6 {
1271 label = "bcm53xx:white:bluebar6";
1272 gpios = <&chipcommon 20 GPIO_ACTIVE_HIGH>;
1273 };
1274
1275- bluebar7 {
1276+ led-bluebar7 {
1277 label = "bcm53xx:white:bluebar7";
1278 gpios = <&chipcommon 21 GPIO_ACTIVE_HIGH>;
1279 };
1280
1281- bluebar8 {
1282+ led-bluebar8 {
1283 label = "bcm53xx:white:bluebar8";
1284 gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>;
1285 };
1286--- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
1287+++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
1288@@ -30,13 +30,13 @@
1289 leds {
1290 compatible = "gpio-leds";
1291
1292- status {
1293+ led-status {
1294 label = "bcm53xx:green:status";
1295 gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
1296 linux,default-trigger = "timer";
1297 };
1298
1299- usb3 {
1300+ led-usb3 {
1301 label = "bcm53xx:green:usb3";
1302 gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>;
1303 trigger-sources = <&ohci_port1>, <&ehci_port1>,
1304--- a/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
1305+++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
1306@@ -23,18 +23,18 @@
1307 leds {
1308 compatible = "gpio-leds";
1309
1310- status {
1311+ led-status {
1312 label = "bcm53xx:green:status";
1313 gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
1314 linux,default-trigger = "timer";
1315 };
1316
1317- 2ghz {
1318+ led-2ghz {
1319 label = "bcm53xx:blue:2ghz";
1320 gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
1321 };
1322
1323- 5ghz {
1324+ led-5ghz {
1325 label = "bcm53xx:blue:5ghz";
1326 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
1327 };
1328--- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
1329+++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
1330@@ -30,13 +30,13 @@
1331 leds {
1332 compatible = "gpio-leds";
1333
1334- status {
1335+ led-status {
1336 label = "bcm53xx:green:status";
1337 gpios = <&chipcommon 20 GPIO_ACTIVE_HIGH>;
1338 linux,default-trigger = "timer";
1339 };
1340
1341- usb3 {
1342+ led-usb3 {
1343 label = "bcm53xx:green:usb3";
1344 gpios = <&chipcommon 19 GPIO_ACTIVE_HIGH>;
1345 trigger-sources = <&ohci_port1>, <&ehci_port1>,
1346--- a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
1347+++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
1348@@ -25,7 +25,7 @@
1349 leds {
1350 compatible = "gpio-leds";
1351
1352- status {
1353+ led-status {
1354 label = "bcm53xx:green:status";
1355 gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
1356 linux,default-trigger = "timer";
1357--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
1358+++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
1359@@ -30,38 +30,38 @@
1360 leds {
1361 compatible = "gpio-leds";
1362
1363- power {
1364+ led-power {
1365 label = "bcm53xx:green:power";
1366 gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
1367 linux,default-trigger = "default-on";
1368 };
1369
1370- lan3 {
1371+ led-lan3 {
1372 label = "bcm53xx:green:lan3";
1373 gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
1374 };
1375
1376- lan4 {
1377+ led-lan4 {
1378 label = "bcm53xx:green:lan4";
1379 gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
1380 };
1381
1382- wan {
1383+ led-wan {
1384 label = "bcm53xx:green:wan";
1385 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
1386 };
1387
1388- lan1 {
1389+ led-lan1 {
1390 label = "bcm53xx:green:lan1";
1391 gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
1392 };
1393
1394- lan2 {
1395+ led-lan2 {
1396 label = "bcm53xx:green:lan2";
1397 gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
1398 };
1399
1400- usb3 {
1401+ led-usb3 {
1402 label = "bcm53xx:green:usb3";
1403 gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
1404 trigger-sources = <&ohci_port1>, <&ehci_port1>,
1405@@ -69,18 +69,18 @@
1406 linux,default-trigger = "usbport";
1407 };
1408
1409- status {
1410+ led-status {
1411 label = "bcm53xx:green:status";
1412 gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
1413 linux,default-trigger = "timer";
1414 };
1415
1416- 2ghz {
1417+ led-2ghz {
1418 label = "bcm53xx:green:2ghz";
1419 gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
1420 };
1421
1422- 5ghz {
1423+ led-5ghz {
1424 label = "bcm53xx:green:5ghz";
1425 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
1426 };
1427--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
1428+++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
1429@@ -33,13 +33,13 @@
1430 leds {
1431 compatible = "gpio-leds";
1432
1433- power {
1434+ led-power {
1435 label = "bcm53xx:green:power";
1436 gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
1437 linux,default-trigger = "default-on";
1438 };
1439
1440- usb3 {
1441+ led-usb3 {
1442 label = "bcm53xx:green:usb3";
1443 gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
1444 trigger-sources = <&ohci_port1>, <&ehci_port1>,
1445@@ -47,18 +47,18 @@
1446 linux,default-trigger = "usbport";
1447 };
1448
1449- status {
1450+ led-status {
1451 label = "bcm53xx:green:status";
1452 gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
1453 linux,default-trigger = "timer";
1454 };
1455
1456- 2ghz {
1457+ led-2ghz {
1458 label = "bcm53xx:green:2ghz";
1459 gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
1460 };
1461
1462- 5ghz {
1463+ led-5ghz {
1464 label = "bcm53xx:green:5ghz";
1465 gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
1466 };
1467--- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
1468+++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
1469@@ -25,38 +25,38 @@
1470 leds {
1471 compatible = "gpio-leds";
1472
1473- power0 {
1474+ led-power0 {
1475 label = "bcm53xx:white:power";
1476 gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
1477 linux,default-trigger = "default-on";
1478 };
1479
1480- power1 {
1481+ led-power1 {
1482 label = "bcm53xx:amber:power";
1483 gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
1484 };
1485
1486- 5ghz-1 {
1487+ led-5ghz-1 {
1488 label = "bcm53xx:white:5ghz-1";
1489 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
1490 };
1491
1492- 5ghz-2 {
1493+ led-5ghz-2 {
1494 label = "bcm53xx:white:5ghz-2";
1495 gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
1496 };
1497
1498- 2ghz {
1499+ led-2ghz {
1500 label = "bcm53xx:white:2ghz";
1501 gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
1502 };
1503
1504- usb2 {
1505+ led-usb2 {
1506 label = "bcm53xx:white:usb2";
1507 gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
1508 };
1509
1510- usb3 {
1511+ led-usb3 {
1512 label = "bcm53xx:white:usb3";
1513 gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
1514 };
1515--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
1516+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
1517@@ -23,13 +23,13 @@
1518 leds {
1519 compatible = "gpio-leds";
1520
1521- wlan {
1522+ led-wlan {
1523 label = "bcm53xx:blue:wlan";
1524 gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
1525 linux,default-trigger = "default-off";
1526 };
1527
1528- system {
1529+ led-system {
1530 label = "bcm53xx:green:system";
1531 gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
1532 linux,default-trigger = "timer";
1533--- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
1534+++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
1535@@ -20,26 +20,26 @@
1536 reg = <0x00000000 0x08000000>;
1537 };
1538
1539- leds {
1540+ leds-0 {
1541 compatible = "gpio-leds";
1542
1543- 5ghz {
1544+ led-5ghz {
1545 label = "bcm53xx:blue:5ghz";
1546 gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>;
1547 linux,default-trigger = "default-off";
1548 };
1549
1550- system {
1551+ led-system {
1552 label = "bcm53xx:green:system";
1553 gpios = <&chipcommon 15 GPIO_ACTIVE_HIGH>;
1554 linux,default-trigger = "timer";
1555 };
1556 };
1557
1558- pcie0_leds {
1559+ leds-1 {
1560 compatible = "gpio-leds";
1561
1562- 2ghz {
1563+ led-2ghz {
1564 label = "bcm53xx:blue:2ghz";
1565 gpios = <&pcie0_chipcommon 3 GPIO_ACTIVE_HIGH>;
1566 linux,default-trigger = "default-off";
1567--- a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
1568+++ b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
1569@@ -20,37 +20,37 @@
1570 reg = <0x00000000 0x08000000>;
1571 };
1572
1573- leds {
1574+ leds-0 {
1575 compatible = "gpio-leds";
1576
1577- usb {
1578+ led-usb {
1579 label = "bcm53xx:blue:usb";
1580 gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
1581 trigger-sources = <&ohci_port1>, <&ehci_port1>;
1582 linux,default-trigger = "usbport";
1583 };
1584
1585- wps {
1586+ led-wps {
1587 label = "bcm53xx:blue:wps";
1588 gpios = <&chipcommon 10 GPIO_ACTIVE_HIGH>;
1589 };
1590
1591- 5ghz {
1592+ led-5ghz {
1593 label = "bcm53xx:blue:5ghz";
1594 gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>;
1595 };
1596
1597- system {
1598+ led-system {
1599 label = "bcm53xx:blue:system";
1600 gpios = <&chipcommon 15 GPIO_ACTIVE_HIGH>;
1601 linux,default-trigger = "timer";
1602 };
1603 };
1604
1605- pcie0_leds {
1606+ leds-1 {
1607 compatible = "gpio-leds";
1608
1609- 2ghz {
1610+ led-2ghz {
1611 label = "bcm53xx:blue:2ghz";
1612 gpios = <&pcie0_chipcommon 3 GPIO_ACTIVE_HIGH>;
1613 };
1614--- a/arch/arm/boot/dts/bcm53016-dlink-dwl-8610ap.dts
1615+++ b/arch/arm/boot/dts/bcm53016-dlink-dwl-8610ap.dts
1616@@ -20,14 +20,14 @@
1617 leds {
1618 compatible = "gpio-leds";
1619
1620- power {
1621+ led-power {
1622 function = LED_FUNCTION_POWER;
1623 color = <LED_COLOR_ID_GREEN>;
1624 gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
1625 default-state = "on";
1626 };
1627
1628- diag {
1629+ led-diag {
1630 /* Actually "diag" unclear what this means */
1631 function = LED_FUNCTION_INDICATOR;
1632 color = <LED_COLOR_ID_RED>;
1633@@ -36,13 +36,13 @@
1634 linux,default-trigger = "heartbeat";
1635 };
1636
1637- wlan-2g {
1638+ led-wlan-2g {
1639 function = LED_FUNCTION_WLAN;
1640 color = <LED_COLOR_ID_GREEN>;
1641 gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
1642 };
1643
1644- wlan-5g {
1645+ led-wlan-5g {
1646 function = LED_FUNCTION_WLAN;
1647 color = <LED_COLOR_ID_GREEN>;
1648 gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
1649--- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
1650+++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
1651@@ -58,7 +58,7 @@
1652 pwm-leds {
1653 compatible = "pwm-leds";
1654
1655- red {
1656+ led-0 {
1657 /* SYS-LED 1 - Tricolor */
1658 function = LED_FUNCTION_INDICATOR;
1659 color = <LED_COLOR_ID_RED>;
1660@@ -66,7 +66,7 @@
1661 max-brightness = <255>;
1662 };
1663
1664- green {
1665+ led-1 {
1666 /* SYS-LED 1 - Tricolor */
1667 function = LED_FUNCTION_POWER;
1668 color = <LED_COLOR_ID_GREEN>;
1669@@ -74,7 +74,7 @@
1670 max-brightness = <255>;
1671 };
1672
1673- blue {
1674+ led-2 {
1675 /* SYS-LED 1 - Tricolor */
1676 function = LED_FUNCTION_INDICATOR;
1677 color = <LED_COLOR_ID_BLUE>;
1678--- a/arch/arm/boot/dts/bcm947189acdbmr.dts
1679+++ b/arch/arm/boot/dts/bcm947189acdbmr.dts
1680@@ -25,17 +25,17 @@
1681 leds {
1682 compatible = "gpio-leds";
1683
1684- wps {
1685+ led-wps {
1686 label = "bcm53xx:blue:wps";
1687 gpios = <&chipcommon 10 GPIO_ACTIVE_HIGH>;
1688 };
1689
1690- 5ghz {
1691+ led-5ghz {
1692 label = "bcm53xx:blue:5ghz";
1693 gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>;
1694 };
1695
1696- 2ghz {
1697+ led-2ghz {
1698 label = "bcm53xx:blue:2ghz";
1699 gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
1700 };