bmips: convert to new LED color/function format where possible

[openwrt/staging/jow.git] / target / linux / bmips / dts / bcm6362-netgear-dgnd3700-v2.dts

diff --git a/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts b/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
index d0befc2c34754cac2eabdeb8e6bc0d2975d395a4..94e9aa3d21cfa74b6b0b8acab7816e7b7b32d601 100644 (file)
--- a/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
+++ b/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6362.dtsi"
 
 / {
@@ -11,17 +13,11 @@
                led-failsafe = &led_power_red;
                led-running = &led_power_green;
                led-upgrade = &led_power_green;
-
-               led-dsl = &led_dsl_green;
-               led-ethernet = &led_ethernet_green;
-               led-internet = &led_internet_green;
-               led-usb = &led_usb1_green;
-               led-usb2 = &led_usb2_green;
        };
 
        keys {
                compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               poll-interval = <100>;
 
                wlan {
                        label = "wlan";
@@ -48,14 +44,16 @@
        leds {
                compatible = "gpio-leds";
 
-               led_dsl_green: led@28 {
+               led@28 {
                        label = "green:dsl";
                        gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
                };
 
                led_power_red: led@34 {
-                       label = "red:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
                        gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
+                       panic-indicator;
                };
        };
 };
@@ -82,7 +80,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_leds &pinctrl_serial_led>;
 
-       led_internet_green: led@1 {
+       led@1 {
                reg = <1>;
                active-low;
                label = "green:internet";
@@ -90,22 +88,24 @@
 
        led_power_green: led@8 {
                reg = <8>;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
        led@9 {
                reg = <9>;
                active-low;
-               label = "green:wps";
+               function = LED_FUNCTION_WPS;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
-       led_usb1_green: led@10 {
+       led@10 {
                reg = <10>;
                active-low;
                label = "green:usb1";
        };
 
-       led_usb2_green: led@11 {
+       led@11 {
                reg = <11>;
                active-low;
                label = "green:usb2";
@@ -117,7 +117,7 @@
                label = "amber:internet";
        };
 
-       led_ethernet_green: led@13 {
+       led@13 {
                reg = <13>;
                active-low;
                label = "green:ethernet";
@@ -186,7 +186,6 @@
 
                        port@8 {
                                reg = <8>;
-                               label = "cpu";
 
                                phy-mode = "rgmii";
                                ethernet = <&switch0port4>;
@@ -210,21 +209,35 @@
                nand-ecc-strength = <15>;
                nand-on-flash-bbt;
 
+               #address-cells = <1>;
+               #size-cells = <1>;
+
                partitions {
                        compatible = "fixed-partitions";
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       cferom: partition@0 {
+                       partition@0 {
                                label = "cferom";
                                reg = <0x0000000 0x0004000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cferom_6a0: macaddr@6a0 {
+                                               reg = <0x6a0 0x6>;
+                                       };
+                               };
                        };
 
                        partition@4000 {
                                compatible = "brcm,wfi";
                                label = "wfi";
                                reg = <0x0004000 0x1c7c000>;
+                               brcm,cferam = "cfe";
                        };
 
                        partition@1c80000 {
@@ -300,13 +313,3 @@
 &usbh {
        status = "okay";
 };
-
-&cferom {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cferom_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};