ramips: clean up useless dts partition labels

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7621_ubnt_usw-flex.dts

diff --git a/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts b/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts
index de5491bf1bf272a2db10b72cabe8bb014e57ee75..0d6d50022292f1e8cee085e5e651e3611c7ab72b 100644 (file)
--- a/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts
+++ b/target/linux/ramips/dts/mt7621_ubnt_usw-flex.dts
@@ -2,6 +2,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        model = "Ubiquiti UniFi Switch Flex";
@@ -33,12 +34,14 @@
                compatible = "gpio-leds";
 
                led_blue: status_blue {
-                       label = "blue:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_BLUE>;
                        gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
                };
 
                led_white: status_white {
-                       label = "white:status";
+                       function = LED_FUNCTION_STATUS;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
                };
        };
@@ -61,16 +64,31 @@
        label = "dsa";
 };
 
+&gmac1 {
+       status = "okay";
+       label = "lan1";
+       phy-handle = <&ethphy4>;
+
+       nvmem-cells = <&macaddr_eeprom>;
+       nvmem-cell-names = "mac-address";
+};
+
+&mdio {
+       ethphy4: ethernet-phy@4 {
+               reg = <4>;
+       };
+};
+
 &switch0 {
        ports {
                port@0 {
                        status = "okay";
-                       label = "lan1";
+                       label = "lan5";
                };
 
                port@1 {
                        status = "okay";
-                       label = "lan2";
+                       label = "lan4";
                };
 
                port@2 {
@@ -80,12 +98,7 @@
 
                port@3 {
                        status = "okay";
-                       label = "lan4";
-               };
-
-               port@4 {
-                       status = "okay";
-                       label = "lan5";
+                       label = "lan2";
                };
        };
 };
@@ -127,18 +140,19 @@
                                read-only;
                        };
 
-                       part_eeprom: partition@80000 {
-                               compatible = "nvmem-cells";
-
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
+                       partition@80000 {
                                label = "eeprom";
                                reg = <0x80000 0x10000>;
                                read-only;
 
-                               macaddr_eeprom: macaddr@0 {
-                                       reg = <0x0 0x6>;
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_eeprom: macaddr@0 {
+                                               reg = <0x0 0x6>;
+                                       };
                                };
                        };
 
@@ -154,14 +168,10 @@
                        };
 
                        partition@1a0000 {
+                               /* Combine kernel0 / kernel1 */
                                compatible = "denx,fit";
                                label = "firmware";
-                               reg = <0x1a0000 0x730000>;
-                       };
-
-                       partition@8d0000 {
-                               label = "kernel1";
-                               reg = <0x8d0000 0x730000>;
+                               reg = <0x1a0000 0xe60000>;
                        };
                };
        };