mvebu: drop redundant label with new LED color/function format

[openwrt/staging/nbd.git] / target / linux / mvebu / files / arch / arm / boot / dts / armada-385-fortinet-fg-50e.dts

diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts
index 6030f4dabec294922b3fbaf9e9370daa27224c37..d202d71c7f721d6ef535f6ffb3860f8e6318c052 100644 (file)
--- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts
+++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-fortinet-fg-50e.dts
@@ -14,28 +14,24 @@
 
 &gpio_leds {
        led-14 {
-               label = "green:speed_wan1";
                gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
                color = <LED_COLOR_ID_GREEN>;
                linux,default-trigger = "f1072004.mdio-mii:00:1Gbps";
        };
 
        led-15 {
-               label = "green:speed_wan2";
                gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
                color = <LED_COLOR_ID_GREEN>;
                linux,default-trigger = "f1072004.mdio-mii:01:1Gbps";
        };
 
        led-16 {
-               label = "amber:speed_lan5";
                gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
                color = <LED_COLOR_ID_AMBER>;
                linux,default-trigger = "mv88e6xxx-1:00:100Mbps";
        };
 
        led-17 {
-               label = "green:speed_lan5";
                gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
                color = <LED_COLOR_ID_GREEN>;
                linux,default-trigger = "mv88e6xxx-1:00:1Gbps";
@@ -56,9 +52,8 @@
        phy-connection-type = "sgmii";
        buffer-manager = <&bm>;
        bm,pool-long = <2>;
-       nvmem-cells = <&macaddr_bdinfo_d880>;
+       nvmem-cells = <&macaddr_bdinfo_d880 1>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <1>;
 };
 
 &eth2 {
@@ -68,9 +63,8 @@
        phy-connection-type = "sgmii";
        buffer-manager = <&bm>;
        bm,pool-long = <3>;
-       nvmem-cells = <&macaddr_bdinfo_d880>;
+       nvmem-cells = <&macaddr_bdinfo_d880 2>;
        nvmem-cell-names = "mac-address";
-       mac-address-increment = <2>;
 };
 
 &mdio {
@@ -126,41 +120,36 @@
                        port@0 {
                                reg = <0>;
                                label = "lan5";
-                               nvmem-cells = <&macaddr_bdinfo_d880>;
+                               nvmem-cells = <&macaddr_bdinfo_d880 7>;
                                nvmem-cell-names = "mac-address";
-                               mac-address-increment = <7>;
                        };
 
                        port@1 {
                                reg = <1>;
                                label = "lan4";
-                               nvmem-cells = <&macaddr_bdinfo_d880>;
+                               nvmem-cells = <&macaddr_bdinfo_d880 6>;
                                nvmem-cell-names = "mac-address";
-                               mac-address-increment = <6>;
                        };
 
                        port@2 {
                                reg = <2>;
                                label = "lan3";
-                               nvmem-cells = <&macaddr_bdinfo_d880>;
+                               nvmem-cells = <&macaddr_bdinfo_d880 5>;
                                nvmem-cell-names = "mac-address";
-                               mac-address-increment = <5>;
                        };
 
                        port@3 {
                                reg = <3>;
                                label = "lan2";
-                               nvmem-cells = <&macaddr_bdinfo_d880>;
+                               nvmem-cells = <&macaddr_bdinfo_d880 4>;
                                nvmem-cell-names = "mac-address";
-                               mac-address-increment = <4>;
                        };
 
                        port@4 {
                                reg = <4>;
                                label = "lan1";
-                               nvmem-cells = <&macaddr_bdinfo_d880>;
+                               nvmem-cells = <&macaddr_bdinfo_d880 3>;
                                nvmem-cell-names = "mac-address";
-                               mac-address-increment = <3>;
                        };
 
                        port@6 {