bcm53xx: backport DT changes from v6.5
[openwrt/staging/hauke.git] / target / linux / bcm53xx / patches-5.4 / 042-v6.2-0004-ARM-dts-broadcom-align-LED-node-names-with-dtschema.patch
diff --git a/target/linux/bcm53xx/patches-5.4/042-v6.2-0004-ARM-dts-broadcom-align-LED-node-names-with-dtschema.patch b/target/linux/bcm53xx/patches-5.4/042-v6.2-0004-ARM-dts-broadcom-align-LED-node-names-with-dtschema.patch
new file mode 100644 (file)
index 0000000..d6bf49d
--- /dev/null
@@ -0,0 +1,1700 @@
+From af84101e3f2258a303fa2461ebec0878ce23ea10 Mon Sep 17 00:00:00 2001
+From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+Date: Fri, 25 Nov 2022 15:41:27 +0100
+Subject: [PATCH] ARM: dts: broadcom: align LED node names with dtschema
+
+The node names should be generic and DT schema expects certain pattern:
+
+  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]+'
+
+Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+Link: https://lore.kernel.org/r/20221125144128.477059-1-krzysztof.kozlowski@linaro.org
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts   | 15 +++++-----
+ arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts   |  8 +++---
+ .../bcm4708-buffalo-wzr-1166dhp-common.dtsi   | 16 +++++------
+ .../boot/dts/bcm4708-buffalo-wzr-1750dhp.dts  | 16 +++++------
+ arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts  |  6 ++--
+ arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts  |  2 +-
+ arch/arm/boot/dts/bcm4708-netgear-r6250.dts   | 10 +++----
+ .../arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 10 +++----
+ arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 22 +++++++--------
+ arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts   | 10 +++----
+ .../boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 14 +++++-----
+ .../boot/dts/bcm47081-buffalo-wzr-900dhp.dts  | 16 +++++------
+ arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts |  6 ++--
+ arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 20 ++++++-------
+ .../boot/dts/bcm47081-tplink-archer-c5-v2.dts | 18 ++++++------
+ arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts   |  6 ++--
+ .../boot/dts/bcm4709-buffalo-wxr-1900dhp.dts  | 18 ++++++------
+ arch/arm/boot/dts/bcm4709-netgear-r7000.dts   | 16 +++++------
+ arch/arm/boot/dts/bcm4709-netgear-r8000.dts   | 22 +++++++--------
+ .../boot/dts/bcm4709-tplink-archer-c9-v1.dts  | 18 ++++++------
+ arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts  | 12 ++++----
+ arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 14 +++++-----
+ arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts | 16 +++++------
+ .../boot/dts/bcm47094-linksys-panamera.dts    | 28 +++++++++----------
+ arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts |  4 +--
+ arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts |  6 ++--
+ arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts |  4 +--
+ arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts |  2 +-
+ arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 20 ++++++-------
+ .../boot/dts/bcm47094-luxul-xwr-3150-v1.dts   | 10 +++----
+ arch/arm/boot/dts/bcm47094-netgear-r8500.dts  | 14 +++++-----
+ arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts |  4 +--
+ arch/arm/boot/dts/bcm47189-luxul-xap-810.dts  | 10 +++----
+ arch/arm/boot/dts/bcm47189-tenda-ac9.dts      | 14 +++++-----
+ .../boot/dts/bcm53016-dlink-dwl-8610ap.dts    |  8 +++---
+ arch/arm/boot/dts/bcm53016-meraki-mr32.dts    |  6 ++--
+ arch/arm/boot/dts/bcm947189acdbmr.dts         |  6 ++--
+ 37 files changed, 223 insertions(+), 224 deletions(-)
+
+--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
+@@ -28,40 +28,39 @@
+       leds {
+               compatible = "gpio-leds";
+-              usb3 {
++              led-usb3 {
+                       label = "bcm53xx:blue:usb3";
+                       gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+               };
+-              wan {
++              led-wan {
+                       label = "bcm53xx:blue:wan";
+                       gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
+               };
+-              lan {
++              led-lan {
+                       label = "bcm53xx:blue:lan";
+                       gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
+               };
+-              power {
++              led-power {
+                       label = "bcm53xx:blue:power";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              all {
++              led-all {
+                       label = "bcm53xx:blue:all";
+                       gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:blue:2ghz";
+                       gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
+               };
+-
+-              usb2 {
++              led-usb2 {
+                       label = "bcm53xx:blue:usb2";
+                       gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
++++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
+@@ -28,24 +28,24 @@
+       leds {
+               compatible = "gpio-leds";
+-              usb2 {
++              led-usb2 {
+                       label = "bcm53xx:blue:usb2";
+                       gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+               };
+-              power {
++              led-power {
+                       label = "bcm53xx:blue:power";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              logo {
++              led-logo {
+                       label = "bcm53xx:white:logo";
+                       gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              usb3 {
++              led-usb3 {
+                       label = "bcm53xx:blue:usb3";
+                       gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi
+@@ -37,7 +37,7 @@
+       leds {
+               compatible = "gpio-leds";
+-              usb {
++              led-usb {
+                       /* label = "bcm53xx:blue:usb"; */
+                       function = LED_FUNCTION_USB;
+                       color = <LED_COLOR_ID_BLUE>;
+@@ -48,14 +48,14 @@
+                       linux,default-trigger = "usbport";
+               };
+-              power0 {
++              led-power0 {
+                       /* label = "bcm53xx:red:power"; */
+                       function = LED_FUNCTION_FAULT;
+                       color = <LED_COLOR_ID_RED>;
+                       gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
+               };
+-              power1 {
++              led-power1 {
+                       /* label = "bcm53xx:white:power"; */
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
+@@ -63,7 +63,7 @@
+                       linux,default-trigger = "default-on";
+               };
+-              router0 {
++              led-router0 {
+                       /*  label = "bcm53xx:blue:router"; */
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_BLUE>;
+@@ -71,14 +71,14 @@
+                       linux,default-trigger = "default-on";
+               };
+-              router1 {
++              led-router1 {
+                       /* label = "bcm53xx:amber:router"; */
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_AMBER>;
+                       gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
+               };
+-              wan {
++              led-wan {
+                       /* label = "bcm53xx:blue:wan"; */
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_BLUE>;
+@@ -86,14 +86,14 @@
+                       linux,default-trigger = "default-on";
+               };
+-              wireless0 {
++              led-wireless0 {
+                       /* label = "bcm53xx:blue:wireless"; */
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_BLUE>;
+                       gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
+               };
+-              wireless1 {
++              led-wireless1 {
+                       /* label = "bcm53xx:amber:wireless"; */
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_AMBER>;
+--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
++++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+@@ -49,7 +49,7 @@
+       leds {
+               compatible = "gpio-leds";
+-              usb {
++              led-usb {
+                       label = "bcm53xx:blue:usb";
+                       gpios = <&hc595 0 GPIO_ACTIVE_HIGH>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>,
+@@ -58,40 +58,40 @@
+                       linux,default-trigger = "usbport";
+               };
+-              power0 {
++              led-power0 {
+                       label = "bcm53xx:red:power";
+                       gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
+               };
+-              power1 {
++              led-power1 {
+                       label = "bcm53xx:white:power";
+                       gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              router0 {
++              led-router0 {
+                       label = "bcm53xx:blue:router";
+                       gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              router1 {
++              led-router1 {
+                       label = "bcm53xx:amber:router";
+                       gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
+               };
+-              wan {
++              led-wan {
+                       label = "bcm53xx:blue:wan";
+                       gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              wireless0 {
++              led-wireless0 {
+                       label = "bcm53xx:blue:wireless";
+                       gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
+               };
+-              wireless1 {
++              led-wireless1 {
+                       label = "bcm53xx:amber:wireless";
+                       gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
+               };
+--- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
++++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
+@@ -23,19 +23,19 @@
+       leds {
+               compatible = "gpio-leds";
+-              5ghz {
++              led-5ghz {
+                       label = "bcm53xx:blue:5ghz";
+                       gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "none";
+               };
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:blue:2ghz";
+                       gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "none";
+               };
+-              status {
++              led-status {
+                       label = "bcm53xx:green:status";
+                       gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "timer";
+--- a/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
++++ b/arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts
+@@ -42,7 +42,7 @@
+       leds {
+               compatible = "gpio-leds";
+-              status {
++              led-status {
+                       label = "bcm53xx:green:status";
+                       gpios = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "timer";
+--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
++++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+@@ -29,24 +29,24 @@
+       leds {
+               compatible = "gpio-leds";
+-              logo {
++              led-logo {
+                       label = "bcm53xx:white:logo";
+                       gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              power0 {
++              led-power0 {
+                       label = "bcm53xx:green:power";
+                       gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              power1 {
++              led-power1 {
+                       label = "bcm53xx:amber:power";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+               };
+-              usb {
++              led-usb {
+                       label = "bcm53xx:blue:usb";
+                       gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>,
+@@ -54,7 +54,7 @@
+                       linux,default-trigger = "usbport";
+               };
+-              wireless {
++              led-wireless {
+                       label = "bcm53xx:blue:wireless";
+                       gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
++++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+@@ -28,29 +28,29 @@
+       leds {
+               compatible = "gpio-leds";
+-              logo {
++              led-logo {
+                       label = "bcm53xx:white:logo";
+                       gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              power0 {
++              led-power0 {
+                       label = "bcm53xx:green:power";
+                       gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
+               };
+-              power1 {
++              led-power1 {
+                       label = "bcm53xx:amber:power";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              usb {
++              led-usb {
+                       label = "bcm53xx:blue:usb";
+                       gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
+               };
+-              wireless {
++              led-wireless {
+                       label = "bcm53xx:blue:wireless";
+                       gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
++++ b/arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
+@@ -28,64 +28,64 @@
+       leds {
+               compatible = "gpio-leds";
+-              power-white {
++              led-power-white {
+                       label = "bcm53xx:white:power";
+                       gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              power-amber {
++              led-power-amber {
+                       label = "bcm53xx:amber:power";
+                       gpios = <&chipcommon 2 GPIO_ACTIVE_HIGH>;
+               };
+-              usb2 {
++              led-usb2 {
+                       label = "bcm53xx:white:usb2";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_HIGH>;
+                       trigger-sources = <&ohci_port2>, <&ehci_port2>;
+                       linux,default-trigger = "usbport";
+               };
+-              usb3-white {
++              led-usb3-white {
+                       label = "bcm53xx:white:usb3";
+                       gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
+                       trigger-sources = <&xhci_port1>;
+                       linux,default-trigger = "usbport";
+               };
+-              usb3-green {
++              led-usb3-green {
+                       label = "bcm53xx:green:usb3";
+                       gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>;
+                       linux,default-trigger = "usbport";
+               };
+-              wps {
++              led-wps {
+                       label = "bcm53xx:white:wps";
+                       gpios = <&chipcommon 6 GPIO_ACTIVE_HIGH>;
+               };
+-              status-red {
++              led-status-red {
+                       label = "bcm53xx:red:status";
+                       gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>;
+               };
+-              status-green {
++              led-status-green {
+                       label = "bcm53xx:green:status";
+                       gpios = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
+               };
+-              status-blue {
++              led-status-blue {
+                       label = "bcm53xx:blue:status";
+                       gpios = <&chipcommon 10 GPIO_ACTIVE_HIGH>;
+               };
+-              wan-white {
++              led-wan-white {
+                       label = "bcm53xx:white:wan";
+                       gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
+               };
+-              wan-red {
++              led-wan-red {
+                       label = "bcm53xx:red:wan";
+                       gpios = <&chipcommon 13 GPIO_ACTIVE_HIGH>;
+               };
+--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
++++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+@@ -28,30 +28,30 @@
+       leds {
+               compatible = "gpio-leds";
+-              power {
++              led-power {
+                       label = "bcm53xx:blue:power";
+                       gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              usb2 {
++              led-usb2 {
+                       label = "bcm53xx:blue:usb2";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+               };
+-              wan {
++              led-wan {
+                       label = "bcm53xx:blue:wan";
+                       gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              lan {
++              led-lan {
+                       label = "bcm53xx:blue:lan";
+                       gpios = <&chipcommon 9 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              usb3 {
++              led-usb3 {
+                       label = "bcm53xx:blue:usb3";
+                       gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
+@@ -49,40 +49,40 @@
+       leds {
+               compatible = "gpio-leds";
+-              power0 {
++              led-power0 {
+                       label = "bcm53xx:green:power";
+                       gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              power1 {
++              led-power1 {
+                       label = "bcm53xx:red:power";
+                       gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
+               };
+-              router0 {
++              led-router0 {
+                       label = "bcm53xx:green:router";
+                       gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              router1 {
++              led-router1 {
+                       label = "bcm53xx:amber:router";
+                       gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
+               };
+-              wan {
++              led-wan {
+                       label = "bcm53xx:green:wan";
+                       gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              wireless0 {
++              led-wireless0 {
+                       label = "bcm53xx:green:wireless";
+                       gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
+               };
+-              wireless1 {
++              led-wireless1 {
+                       label = "bcm53xx:amber:wireless";
+                       gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
+               };
+--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
++++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
+@@ -49,45 +49,45 @@
+       leds {
+               compatible = "gpio-leds";
+-              usb {
++              led-usb {
+                       label = "bcm53xx:green:usb";
+                       gpios = <&hc595 0 GPIO_ACTIVE_HIGH>;
+               };
+-              power0 {
++              led-power0 {
+                       label = "bcm53xx:green:power";
+                       gpios = <&hc595 1 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              power1 {
++              led-power1 {
+                       label = "bcm53xx:red:power";
+                       gpios = <&hc595 2 GPIO_ACTIVE_HIGH>;
+               };
+-              router0 {
++              led-router0 {
+                       label = "bcm53xx:green:router";
+                       gpios = <&hc595 3 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              router1 {
++              led-router1 {
+                       label = "bcm53xx:amber:router";
+                       gpios = <&hc595 4 GPIO_ACTIVE_HIGH>;
+               };
+-              wan {
++              led-wan {
+                       label = "bcm53xx:green:wan";
+                       gpios = <&hc595 5 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              wireless0 {
++              led-wireless0 {
+                       label = "bcm53xx:green:wireless";
+                       gpios = <&hc595 6 GPIO_ACTIVE_HIGH>;
+               };
+-              wireless1 {
++              led-wireless1 {
+                       label = "bcm53xx:amber:wireless";
+                       gpios = <&hc595 7 GPIO_ACTIVE_HIGH>;
+               };
+--- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
++++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
+@@ -23,19 +23,19 @@
+       leds {
+               compatible = "gpio-leds";
+-              5ghz {
++              led-5ghz {
+                       label = "bcm53xx:blue:5ghz";
+                       gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "none";
+               };
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:blue:2ghz";
+                       gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "none";
+               };
+-              status {
++              led-status {
+                       label = "bcm53xx:green:status";
+                       gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "timer";
+--- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
++++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
+@@ -29,62 +29,62 @@
+       leds {
+               compatible = "gpio-leds";
+-              power {
++              led-power {
+                       label = "bcm53xx:green:power";
+                       gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              lan3 {
++              led-lan3 {
+                       label = "bcm53xx:green:lan3";
+                       gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "none";
+               };
+-              lan4 {
++              led-lan4 {
+                       label = "bcm53xx:green:lan4";
+                       gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "none";
+               };
+-              wan {
++              led-wan {
+                       label = "bcm53xx:green:wan";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "none";
+               };
+-              lan2 {
++              led-lan2 {
+                       label = "bcm53xx:green:lan2";
+                       gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "none";
+               };
+-              usb {
++              led-usb {
+                       label = "bcm53xx:green:usb";
+                       gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ohci_port2>, <&ehci_port2>;
+                       linux,default-trigger = "usbport";
+               };
+-              status {
++              led-status {
+                       label = "bcm53xx:green:status";
+                       gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "timer";
+               };
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:green:2ghz";
+                       gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "none";
+               };
+-              5ghz {
++              led-5ghz {
+                       label = "bcm53xx:green:5ghz";
+                       gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "none";
+               };
+-              lan1 {
++              led-lan1 {
+                       label = "bcm53xx:green:lan1";
+                       gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "none";
+--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
++++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
+@@ -23,50 +23,50 @@
+       leds {
+               compatible = "gpio-leds";
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:green:2ghz";
+                       gpios = <&chipcommon 0 GPIO_ACTIVE_HIGH>;
+               };
+-              lan {
++              led-lan {
+                       label = "bcm53xx:green:lan";
+                       gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
+               };
+-              usb2-port1 {
++              led-usb2-port1 {
+                       label = "bcm53xx:green:usb2-port1";
+                       gpios = <&chipcommon 2 GPIO_ACTIVE_HIGH>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>;
+                       linux,default-trigger = "usbport";
+               };
+-              power {
++              led-power {
+                       label = "bcm53xx:green:power";
+                       gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              wan-green {
++              led-wan-green {
+                       label = "bcm53xx:green:wan";
+                       gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
+               };
+-              wps {
++              led-wps {
+                       label = "bcm53xx:green:wps";
+                       gpios = <&chipcommon 6 GPIO_ACTIVE_HIGH>;
+               };
+-              wan-amber {
++              led-wan-amber {
+                       label = "bcm53xx:amber:wan";
+                       gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>;
+               };
+-              5ghz {
++              led-5ghz {
+                       label = "bcm53xx:green:5ghz";
+                       gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
+               };
+-              usb2-port2 {
++              led-usb2-port2 {
+                       label = "bcm53xx:green:usb2-port2";
+                       gpios = <&chipcommon 13 GPIO_ACTIVE_HIGH>;
+                       trigger-sources = <&ohci_port2>, <&ehci_port2>;
+--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
++++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
+@@ -28,18 +28,18 @@
+       leds {
+               compatible = "gpio-leds";
+-              wps {
++              led-wps {
+                       label = "bcm53xx:blue:wps";
+                       gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
+               };
+-              power {
++              led-power {
+                       label = "bcm53xx:blue:power";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              wan {
++              led-wan {
+                       label = "bcm53xx:red:wan";
+                       gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
++++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+@@ -28,48 +28,48 @@
+       leds {
+               compatible = "gpio-leds";
+-              usb {
++              led-usb {
+                       label = "bcm53xx:green:usb";
+                       gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
+               };
+-              power-amber {
++              led-power-amber {
+                       label = "bcm53xx:amber:power";
+                       gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
+               };
+-              power-white {
++              led-power-white {
+                       label = "bcm53xx:white:power";
+                       gpios = <&chipcommon 6 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              router-amber {
++              led-router-amber {
+                       label = "bcm53xx:amber:router";
+                       gpios = <&chipcommon 7 GPIO_ACTIVE_HIGH>;
+               };
+-              router-white {
++              led-router-white {
+                       label = "bcm53xx:white:router";
+                       gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>;
+               };
+-              wan-amber {
++              led-wan-amber {
+                       label = "bcm53xx:amber:wan";
+                       gpios = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
+               };
+-              wan-white {
++              led-wan-white {
+                       label = "bcm53xx:white:wan";
+                       gpios = <&chipcommon 10 GPIO_ACTIVE_HIGH>;
+               };
+-              wireless-amber {
++              led-wireless-amber {
+                       label = "bcm53xx:amber:wireless";
+                       gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>;
+               };
+-              wireless-white {
++              led-wireless-white {
+                       label = "bcm53xx:white:wireless";
+                       gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
+               };
+--- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
++++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
+@@ -28,43 +28,43 @@
+       leds {
+               compatible = "gpio-leds";
+-              power-white {
++              led-power-white {
+                       label = "bcm53xx:white:power";
+                       gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              power-amber {
++              led-power-amber {
+                       label = "bcm53xx:amber:power";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+               };
+-              5ghz {
++              led-5ghz {
+                       label = "bcm53xx:white:5ghz";
+                       gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
+               };
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:white:2ghz";
+                       gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+               };
+-              wps {
++              led-wps {
+                       label = "bcm53xx:white:wps";
+                       gpios = <&chipcommon 14 GPIO_ACTIVE_HIGH>;
+               };
+-              wireless {
++              led-wireless {
+                       label = "bcm53xx:white:wireless";
+                       gpios = <&chipcommon 15 GPIO_ACTIVE_HIGH>;
+               };
+-              usb3 {
++              led-usb3 {
+                       label = "bcm53xx:white:usb3";
+                       gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+               };
+-              usb2 {
++              led-usb2 {
+                       label = "bcm53xx:white:usb2";
+                       gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
++++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
+@@ -39,59 +39,59 @@
+       leds {
+               compatible = "gpio-leds";
+-              power-white {
++              led-power-white {
+                       label = "bcm53xx:white:power";
+                       gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              power-amber {
++              led-power-amber {
+                       label = "bcm53xx:amber:power";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+               };
+-              wan-white {
++              led-wan-white {
+                       label = "bcm53xx:white:wan";
+                       gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              wan-amber {
++              led-wan-amber {
+                       label = "bcm53xx:amber:wan";
+                       gpios = <&chipcommon 9 GPIO_ACTIVE_HIGH>;
+               };
+-              5ghz-1 {
++              led-5ghz-1 {
+                       label = "bcm53xx:white:5ghz-1";
+                       gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
+               };
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:white:2ghz";
+                       gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+               };
+-              wireless {
++              led-wireless {
+                       label = "bcm53xx:white:wireless";
+                       gpios = <&chipcommon 14 GPIO_ACTIVE_HIGH>;
+               };
+-              wps {
++              led-wps {
+                       label = "bcm53xx:white:wps";
+                       gpios = <&chipcommon 15 GPIO_ACTIVE_HIGH>;
+               };
+-              5ghz-2 {
++              led-5ghz-2 {
+                       label = "bcm53xx:white:5ghz-2";
+                       gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>;
+               };
+-              usb3 {
++              led-usb3 {
+                       label = "bcm53xx:white:usb3";
+                       gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+               };
+-              usb2 {
++              led-usb2 {
+                       label = "bcm53xx:white:usb2";
+                       gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
++++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
+@@ -23,27 +23,27 @@
+       leds {
+               compatible = "gpio-leds";
+-              lan {
++              led-lan {
+                       label = "bcm53xx:blue:lan";
+                       gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
+               };
+-              wps {
++              led-wps {
+                       label = "bcm53xx:blue:wps";
+                       gpios = <&chipcommon 2 GPIO_ACTIVE_HIGH>;
+               };
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:blue:2ghz";
+                       gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
+               };
+-              5ghz {
++              led-5ghz {
+                       label = "bcm53xx:blue:5ghz";
+                       gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
+               };
+-              usb3 {
++              led-usb3 {
+                       label = "bcm53xx:blue:usb3";
+                       gpios = <&chipcommon 6 GPIO_ACTIVE_HIGH>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>,
+@@ -51,24 +51,24 @@
+                       linux,default-trigger = "usbport";
+               };
+-              usb2 {
++              led-usb2 {
+                       label = "bcm53xx:blue:usb2";
+                       gpios = <&chipcommon 7 GPIO_ACTIVE_HIGH>;
+                       trigger-sources = <&ohci_port2>, <&ehci_port2>;
+                       linux,default-trigger = "usbport";
+               };
+-              wan-blue {
++              led-wan-blue {
+                       label = "bcm53xx:blue:wan";
+                       gpios = <&chipcommon 14 GPIO_ACTIVE_HIGH>;
+               };
+-              wan-amber {
++              led-wan-amber {
+                       label = "bcm53xx:amber:wan";
+                       gpios = <&chipcommon 15 GPIO_ACTIVE_HIGH>;
+               };
+-              power {
++              led-power {
+                       label = "bcm53xx:blue:power";
+                       gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+--- a/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
++++ b/arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts
+@@ -33,37 +33,37 @@
+       leds {
+               compatible = "gpio-leds";
+-              power {
++              led-power {
+                       label = "white:power";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              wan-red {
++              led-wan-red {
+                       label = "red:wan";
+                       gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
+               };
+-              lan {
++              led-lan {
+                       label = "white:lan";
+                       gpios = <&chipcommon 21 GPIO_ACTIVE_LOW>;
+               };
+-              usb2 {
++              led-usb2 {
+                       label = "white:usb2";
+                       gpios = <&chipcommon 16 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ehci_port2>;
+                       linux,default-trigger = "usbport";
+               };
+-              usb3 {
++              led-usb3 {
+                       label = "white:usb3";
+                       gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ehci_port1>, <&xhci_port1>;
+                       linux,default-trigger = "usbport";
+               };
+-              wps {
++              led-wps {
+                       label = "white:wps";
+                       gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
+@@ -43,28 +43,28 @@
+       leds {
+               compatible = "gpio-leds";
+-              power-white {
++              led-power-white {
+                       label = "bcm53xx:white:power";
+                       gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              wan-white {
++              led-wan-white {
+                       label = "bcm53xx:white:wan";
+                       gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
+               };
+-              power-amber {
++              led-power-amber {
+                       label = "bcm53xx:amber:power";
+                       gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
+               };
+-              wan-amber {
++              led-wan-amber {
+                       label = "bcm53xx:amber:wan";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+               };
+-              usb3-white {
++              led-usb3-white {
+                       label = "bcm53xx:white:usb3";
+                       gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>,
+@@ -72,12 +72,12 @@
+                       linux,default-trigger = "usbport";
+               };
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:white:2ghz";
+                       gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+               };
+-              5ghz {
++              led-5ghz {
+                       label = "bcm53xx:white:5ghz";
+                       gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts
++++ b/arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts
+@@ -41,47 +41,47 @@
+                */
+               compatible = "gpio-leds";
+-              power-white {
++              led-power-white {
+                       label = "bcm53xx:white:power";
+                       gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              wan-white {
++              led-wan-white {
+                       label = "bcm53xx:white:wan";
+                       gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
+               };
+-              power-amber {
++              led-power-amber {
+                       label = "bcm53xx:amber:power";
+                       gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
+               };
+-              wan-amber {
++              led-wan-amber {
+                       label = "bcm53xx:amber:wan";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+               };
+-              usb3-white {
++              led-usb3-white {
+                       label = "bcm53xx:white:usb3";
+                       gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&xhci_port1>;
+                       linux,default-trigger = "usbport";
+               };
+-              usb2-white {
++              led-usb2-white {
+                       label = "bcm53xx:white:usb2";
+                       gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>;
+                       linux,default-trigger = "usbport";
+               };
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:white:2ghz";
+                       gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+               };
+-              5ghz {
++              led-5ghz {
+                       label = "bcm53xx:white:5ghz";
+                       gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
++++ b/arch/arm/boot/dts/bcm47094-linksys-panamera.dts
+@@ -52,19 +52,19 @@
+       leds {
+               compatible = "gpio-leds";
+-              wps {
++              led-wps {
+                       label = "bcm53xx:white:wps";
+                       gpios = <&chipcommon 22 GPIO_ACTIVE_LOW>;
+               };
+-              usb2 {
++              led-usb2 {
+                       label = "bcm53xx:green:usb2";
+                       gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ohci_port2>, <&ehci_port2>;
+                       linux,default-trigger = "usbport";
+               };
+-              usb3 {
++              led-usb3 {
+                       label = "bcm53xx:green:usb3";
+                       gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>,
+@@ -72,58 +72,58 @@
+                       linux,default-trigger = "usbport";
+               };
+-              power {
++              led-power {
+                       label = "bcm53xx:white:power";
+                       gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-on";
+               };
+-              wifi-disabled {
++              led-wifi-disabled {
+                       label = "bcm53xx:amber:wifi-disabled";
+                       gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+               };
+-              wifi-enabled {
++              led-wifi-enabled {
+                       label = "bcm53xx:white:wifi-enabled";
+                       gpios = <&chipcommon 5 GPIO_ACTIVE_HIGH>;
+               };
+-              bluebar1 {
++              led-bluebar1 {
+                       label = "bcm53xx:white:bluebar1";
+                       gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>;
+               };
+-              bluebar2 {
++              led-bluebar2 {
+                       label = "bcm53xx:white:bluebar2";
+                       gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
+               };
+-              bluebar3 {
++              led-bluebar3 {
+                       label = "bcm53xx:white:bluebar3";
+                       gpios = <&chipcommon 15 GPIO_ACTIVE_LOW>;
+               };
+-              bluebar4 {
++              led-bluebar4 {
+                       label = "bcm53xx:white:bluebar4";
+                       gpios = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
+               };
+-              bluebar5 {
++              led-bluebar5 {
+                       label = "bcm53xx:white:bluebar5";
+                       gpios = <&chipcommon 19 GPIO_ACTIVE_HIGH>;
+               };
+-              bluebar6 {
++              led-bluebar6 {
+                       label = "bcm53xx:white:bluebar6";
+                       gpios = <&chipcommon 20 GPIO_ACTIVE_HIGH>;
+               };
+-              bluebar7 {
++              led-bluebar7 {
+                       label = "bcm53xx:white:bluebar7";
+                       gpios = <&chipcommon 21 GPIO_ACTIVE_HIGH>;
+               };
+-              bluebar8 {
++              led-bluebar8 {
+                       label = "bcm53xx:white:bluebar8";
+                       gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>;
+               };
+--- a/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
+@@ -30,13 +30,13 @@
+       leds {
+               compatible = "gpio-leds";
+-              status {
++              led-status {
+                       label = "bcm53xx:green:status";
+                       gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "timer";
+               };
+-              usb3 {
++              led-usb3 {
+                       label = "bcm53xx:green:usb3";
+                       gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>,
+--- a/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts
+@@ -23,18 +23,18 @@
+       leds {
+               compatible = "gpio-leds";
+-              status  {
++              led-status {
+                       label = "bcm53xx:green:status";
+                       gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "timer";
+               };
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:blue:2ghz";
+                       gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+               };
+-              5ghz {
++              led-5ghz {
+                       label = "bcm53xx:blue:5ghz";
+                       gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
+@@ -30,13 +30,13 @@
+       leds {
+               compatible = "gpio-leds";
+-              status {
++              led-status {
+                       label = "bcm53xx:green:status";
+                       gpios = <&chipcommon 20 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "timer";
+               };
+-              usb3 {
++              led-usb3 {
+                       label = "bcm53xx:green:usb3";
+                       gpios = <&chipcommon 19 GPIO_ACTIVE_HIGH>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>,
+--- a/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
+@@ -25,7 +25,7 @@
+       leds {
+               compatible = "gpio-leds";
+-              status  {
++              led-status {
+                       label = "bcm53xx:green:status";
+                       gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "timer";
+--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
+@@ -30,38 +30,38 @@
+       leds {
+               compatible = "gpio-leds";
+-              power   {
++              led-power {
+                       label = "bcm53xx:green:power";
+                       gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              lan3    {
++              led-lan3 {
+                       label = "bcm53xx:green:lan3";
+                       gpios = <&chipcommon 1 GPIO_ACTIVE_LOW>;
+               };
+-              lan4    {
++              led-lan4 {
+                       label = "bcm53xx:green:lan4";
+                       gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
+               };
+-              wan     {
++              led-wan {
+                       label = "bcm53xx:green:wan";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+               };
+-              lan1    {
++              led-lan1 {
+                       label = "bcm53xx:green:lan1";
+                       gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
+               };
+-              lan2    {
++              led-lan2 {
+                       label = "bcm53xx:green:lan2";
+                       gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
+               };
+-              usb3    {
++              led-usb3 {
+                       label = "bcm53xx:green:usb3";
+                       gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>,
+@@ -69,18 +69,18 @@
+                       linux,default-trigger = "usbport";
+               };
+-              status  {
++              led-status {
+                       label = "bcm53xx:green:status";
+                       gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "timer";
+               };
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:green:2ghz";
+                       gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+               };
+-              5ghz {
++              led-5ghz {
+                       label = "bcm53xx:green:5ghz";
+                       gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
++++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
+@@ -33,13 +33,13 @@
+       leds {
+               compatible = "gpio-leds";
+-              power   {
++              led-power {
+                       label = "bcm53xx:green:power";
+                       gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              usb3    {
++              led-usb3 {
+                       label = "bcm53xx:green:usb3";
+                       gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>,
+@@ -47,18 +47,18 @@
+                       linux,default-trigger = "usbport";
+               };
+-              status  {
++              led-status {
+                       label = "bcm53xx:green:status";
+                       gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "timer";
+               };
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:green:2ghz";
+                       gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+               };
+-              5ghz {
++              led-5ghz {
+                       label = "bcm53xx:green:5ghz";
+                       gpios = <&chipcommon 14 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
++++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
+@@ -25,38 +25,38 @@
+       leds {
+               compatible = "gpio-leds";
+-              power0 {
++              led-power0 {
+                       label = "bcm53xx:white:power";
+                       gpios = <&chipcommon 2 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-on";
+               };
+-              power1 {
++              led-power1 {
+                       label = "bcm53xx:amber:power";
+                       gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
+               };
+-              5ghz-1 {
++              led-5ghz-1 {
+                       label = "bcm53xx:white:5ghz-1";
+                       gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+               };
+-              5ghz-2 {
++              led-5ghz-2 {
+                       label = "bcm53xx:white:5ghz-2";
+                       gpios = <&chipcommon 12 GPIO_ACTIVE_LOW>;
+               };
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:white:2ghz";
+                       gpios = <&chipcommon 13 GPIO_ACTIVE_LOW>;
+               };
+-              usb2 {
++              led-usb2 {
+                       label = "bcm53xx:white:usb2";
+                       gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
+               };
+-              usb3 {
++              led-usb3 {
+                       label = "bcm53xx:white:usb3";
+                       gpios = <&chipcommon 18 GPIO_ACTIVE_LOW>;
+               };
+--- a/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
+@@ -23,13 +23,13 @@
+       leds {
+               compatible = "gpio-leds";
+-              wlan {
++              led-wlan {
+                       label = "bcm53xx:blue:wlan";
+                       gpios = <&chipcommon 10 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "default-off";
+               };
+-              system {
++              led-system {
+                       label = "bcm53xx:green:system";
+                       gpios = <&chipcommon 11 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "timer";
+--- a/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
++++ b/arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
+@@ -20,26 +20,26 @@
+               reg = <0x00000000 0x08000000>;
+       };
+-      leds {
++      leds-0 {
+               compatible = "gpio-leds";
+-              5ghz {
++              led-5ghz {
+                       label = "bcm53xx:blue:5ghz";
+                       gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-off";
+               };
+-              system {
++              led-system {
+                       label = "bcm53xx:green:system";
+                       gpios = <&chipcommon 15 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "timer";
+               };
+       };
+-      pcie0_leds {
++      leds-1 {
+               compatible = "gpio-leds";
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:blue:2ghz";
+                       gpios = <&pcie0_chipcommon 3 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "default-off";
+--- a/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
++++ b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts
+@@ -20,37 +20,37 @@
+               reg = <0x00000000 0x08000000>;
+       };
+-      leds {
++      leds-0 {
+               compatible = "gpio-leds";
+-              usb {
++              led-usb {
+                       label = "bcm53xx:blue:usb";
+                       gpios = <&chipcommon 1 GPIO_ACTIVE_HIGH>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>;
+                       linux,default-trigger = "usbport";
+               };
+-              wps {
++              led-wps {
+                       label = "bcm53xx:blue:wps";
+                       gpios = <&chipcommon 10 GPIO_ACTIVE_HIGH>;
+               };
+-              5ghz {
++              led-5ghz {
+                       label = "bcm53xx:blue:5ghz";
+                       gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>;
+               };
+-              system {
++              led-system {
+                       label = "bcm53xx:blue:system";
+                       gpios = <&chipcommon 15 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "timer";
+               };
+       };
+-      pcie0_leds {
++      leds-1 {
+               compatible = "gpio-leds";
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:blue:2ghz";
+                       gpios = <&pcie0_chipcommon 3 GPIO_ACTIVE_HIGH>;
+               };
+--- a/arch/arm/boot/dts/bcm53016-dlink-dwl-8610ap.dts
++++ b/arch/arm/boot/dts/bcm53016-dlink-dwl-8610ap.dts
+@@ -20,14 +20,14 @@
+       leds {
+               compatible = "gpio-leds";
+-              power {
++              led-power {
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
+                       default-state = "on";
+               };
+-              diag {
++              led-diag {
+                       /* Actually "diag" unclear what this means */
+                       function = LED_FUNCTION_INDICATOR;
+                       color = <LED_COLOR_ID_RED>;
+@@ -36,13 +36,13 @@
+                       linux,default-trigger = "heartbeat";
+               };
+-              wlan-2g {
++              led-wlan-2g {
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&chipcommon 5 GPIO_ACTIVE_LOW>;
+               };
+-              wlan-5g {
++              led-wlan-5g {
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&chipcommon 8 GPIO_ACTIVE_LOW>;
+--- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
++++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
+@@ -58,7 +58,7 @@
+       pwm-leds {
+               compatible = "pwm-leds";
+-              red {
++              led-0 {
+                       /* SYS-LED 1 - Tricolor */
+                       function = LED_FUNCTION_INDICATOR;
+                       color = <LED_COLOR_ID_RED>;
+@@ -66,7 +66,7 @@
+                       max-brightness = <255>;
+               };
+-              green {
++              led-1 {
+                       /* SYS-LED 1 - Tricolor */
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
+@@ -74,7 +74,7 @@
+                       max-brightness = <255>;
+               };
+-              blue {
++              led-2 {
+                       /* SYS-LED 1 - Tricolor */
+                       function = LED_FUNCTION_INDICATOR;
+                       color = <LED_COLOR_ID_BLUE>;
+--- a/arch/arm/boot/dts/bcm947189acdbmr.dts
++++ b/arch/arm/boot/dts/bcm947189acdbmr.dts
+@@ -25,17 +25,17 @@
+       leds {
+               compatible = "gpio-leds";
+-              wps {
++              led-wps {
+                       label = "bcm53xx:blue:wps";
+                       gpios = <&chipcommon 10 GPIO_ACTIVE_HIGH>;
+               };
+-              5ghz {
++              led-5ghz {
+                       label = "bcm53xx:blue:5ghz";
+                       gpios = <&chipcommon 11 GPIO_ACTIVE_HIGH>;
+               };
+-              2ghz {
++              led-2ghz {
+                       label = "bcm53xx:blue:2ghz";
+                       gpios = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
+               };