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 3ad37fed7152ef37577b050e4aae8d1ab0557877..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"
 
 / {
@@ -8,39 +10,35 @@
 
        aliases {
                led-boot = &led_power_green;
-               led-failsafe = &led_power_green;
+               led-failsafe = &led_power_red;
                led-running = &led_power_green;
                led-upgrade = &led_power_green;
-
-               led-ethernet = &led_ethernet_green;
-               led-usb = &led_usb1_green;
-               led-usb2 = &led_usb2_green;
        };
 
        keys {
                compatible = "gpio-keys-polled";
-               poll-interval = <20>;
-
-               reset {
-                       label = "reset";
-                       gpios = <&pinctrl 24 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-                       debounce-interval = <60>;
-               };
+               poll-interval = <100>;
 
                wlan {
                        label = "wlan";
-                       gpios = <&pinctrl 25 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WLAN>;
                        debounce-interval = <60>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&pinctrl 26 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                        debounce-interval = <60>;
                };
+
+               reset {
+                       label = "reset";
+                       gpios = <&gpio 31 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
+                       debounce-interval = <60>;
+               };
        };
 
        leds {
@@ -48,12 +46,14 @@
 
                led@28 {
                        label = "green:dsl";
-                       gpios = <&pinctrl 28 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
                };
 
-               led@34 {
-                       label = "red:power";
-                       gpios = <&pinctrl 34 GPIO_ACTIVE_LOW>;
+               led_power_red: led@34 {
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
+                       gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
+                       panic-indicator;
                };
        };
 };
@@ -65,7 +65,8 @@
 &ethernet {
        status = "okay";
 
-       mtd-mac-address = <&cferom 0x6a0>;
+       nvmem-cells = <&macaddr_cferom_6a0>;
+       nvmem-cell-names = "mac-address";
 };
 
 &leds {
@@ -87,13 +88,15 @@
 
        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@10 {
@@ -114,7 +117,7 @@
                label = "amber:internet";
        };
 
-       led_ethernet_green: led@13 {
+       led@13 {
                reg = <13>;
                active-low;
                label = "green:ethernet";
@@ -126,13 +129,13 @@
                label = "amber:dsl";
        };
 
-       led_usb1_green: led@16 {
+       led@16 {
                reg = <16>;
                active-low;
                label = "amber:usb1";
        };
 
-       led_usb2_green: led@17 {
+       led@17 {
                reg = <17>;
                active-low;
                label = "amber:usb2";
@@ -145,6 +148,57 @@
        };
 };
 
+&mdio_ext {
+       switch@1e {
+               compatible = "brcm,bcm53125";
+               reg = <30>;
+
+               dsa,member = <1 0>;
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+                               label = "lan1";
+                       };
+
+                       port@1 {
+                               reg = <1>;
+                               label = "lan2";
+                       };
+
+                       port@2 {
+                               reg = <2>;
+                               label = "lan3";
+                       };
+
+                       port@3 {
+                               reg = <3>;
+                               label = "lan4";
+                       };
+
+                       port@4 {
+                               reg = <4>;
+                               label = "wan";
+                       };
+
+                       port@8 {
+                               reg = <8>;
+
+                               phy-mode = "rgmii";
+                               ethernet = <&switch0port4>;
+
+                               fixed-link {
+                                       speed = <1000>;
+                                       full-duplex;
+                               };
+                       };
+               };
+       };
+};
+
 &nflash {
        status = "okay";
 
@@ -155,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 {
@@ -221,8 +289,10 @@
 };
 
 &switch0 {
+       dsa,member = <0 0>;
+
        ports {
-               port@4 {
+               switch0port4: port@4 {
                        reg = <4>;
                        label = "extsw";