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

[openwrt/staging/jow.git] / target / linux / bmips / dts / bcm6328-comtrend-ar-5387un.dts

diff --git a/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts b/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
index 47db0809e19ebbd02871f17d2d5dc3b37eb7d83d..402e54e5df7392c61f772aae2b756fe24240421d 100644 (file)
--- a/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
+++ b/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <dt-bindings/leds/common.h>
+
 #include "bcm6328.dtsi"
 
 / {
@@ -11,14 +13,11 @@
                led-failsafe = &led_power_red;
                led-running = &led_power_green;
                led-upgrade = &led_power_green;
-
-               led-dsl = &led_dsl_green;
-               led-internet = &led_internet_green;
        };
 
        keys {
                compatible = "gpio-keys-polled";
-               poll-interval = <20>;
+               poll-interval = <100>;
 
                reset {
                        label = "reset";
@@ -29,15 +28,15 @@
        };
 
        bcm43225-sprom {
-               compatible = "brcm,bcm43225-sprom";
+               compatible = "brcm,bcma-sprom";
 
                pci-bus = <1>;
                pci-dev = <0>;
 
-               nvmem-cells = <&macaddr_cfe_6a0>;
+               nvmem-cells = <&macaddr_cfe_6a0 1>;
                nvmem-cell-names = "mac-address";
-               mac-address-increment = <1>;
 
+               brcm,sprom = "brcm/bcm43225-sprom.bin";
                brcm,sprom-fixups = <2 0x05bb>,
                                    <65 0x1204>,
                                    <78 0x0303>,
@@ -72,7 +71,7 @@
 &ethernet {
        status = "okay";
 
-       nvmem-cells = <&macaddr_cfe_6a0>;
+       nvmem-cells = <&macaddr_cfe_6a0 0>;
        nvmem-cell-names = "mac-address";
 };
 
@@ -94,10 +93,22 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
 
-                       cfe: partition@0 {
+                       partition@0 {
                                reg = <0x000000 0x010000>;
                                label = "cfe";
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_cfe_6a0: macaddr@6a0 {
+                                               compatible = "mac-base";
+                                               reg = <0x6a0 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@10000 {
@@ -127,20 +138,23 @@
 
        led_power_red: led@4 {
                reg = <4>;
-               label = "red:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_RED>;
+               panic-indicator;
        };
 
-       led_internet_green: led@7 {
+       led@7 {
                reg = <7>;
                label = "green:internet";
        };
 
        led_power_green: led@8 {
                reg = <8>;
-               label = "green:power";
+               function = LED_FUNCTION_POWER;
+               color = <LED_COLOR_ID_GREEN>;
        };
 
-       led_dsl_green: led@11 {
+       led@11 {
                reg = <11>;
                active-low;
                label = "green:dsl";
@@ -170,6 +184,7 @@
                        label = "lan1";
 
                        phy-handle = <&phy1>;
+                       phy-mode = "mii";
                };
 
                port@1 {
@@ -177,6 +192,7 @@
                        label = "lan2";
 
                        phy-handle = <&phy2>;
+                       phy-mode = "mii";
                };
 
                port@2 {
@@ -184,6 +200,7 @@
                        label = "lan3";
 
                        phy-handle = <&phy3>;
+                       phy-mode = "mii";
                };
 
                port@3 {
@@ -191,6 +208,7 @@
                        label = "lan4";
 
                        phy-handle = <&phy4>;
+                       phy-mode = "mii";
                };
        };
 };
@@ -202,13 +220,3 @@
 &usbh {
        status = "okay";
 };
-
-&cfe {
-       compatible = "nvmem-cells";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       macaddr_cfe_6a0: macaddr@6a0 {
-               reg = <0x6a0 0x6>;
-       };
-};