ramips: clean up useless dts partition labels

[openwrt/openwrt.git] / target / linux / ramips / dts / mt7621_dlink_dir-xx60-a1.dtsi

diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi b/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi
index 96c69211243b2e958382f5ffc15b770b02fd7324..ddc3e1ad30afa30f2ffecb033674a81670dd4a74 100644 (file)
--- a/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-xx60-a1.dtsi
@@ -4,6 +4,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
 
 / {
        aliases {
@@ -34,12 +35,14 @@
                compatible = "gpio-leds";
 
                led_power_orange: power_orange {
-                       label = "orange:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_ORANGE>;
                        gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                led_power_white: power_white {
-                       label = "white:power";
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_WHITE>;
                        gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
                };
 
@@ -75,10 +78,34 @@
                        read-only;
                };
 
-               factory: partition@100000 {
+               partition@100000 {
                        label = "factory";
                        reg = <0x100000 0x40000>;
                        read-only;
+
+                       nvmem-layout {
+                               compatible = "fixed-layout";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               eeprom_factory_0: eeprom@0 {
+                                       reg = <0x0 0x4da8>;
+                               };
+
+                               eeprom_factory_8000: eeprom@8000 {
+                                       reg = <0x8000 0x4da8>;
+                               };
+
+                               macaddr_factory_e000: macaddr@e000 {
+                                       compatible = "mac-base";
+                                       reg = <0xe000 0x6>;
+                                       #nvmem-cell-cells = <1>;
+                               };
+
+                               macaddr_factory_e006: macaddr@e006 {
+                                       reg = <0xe006 0x6>;
+                               };
+                       };
                };
 
                partition@140000 {
@@ -89,7 +116,8 @@
 
                partition@180000 {
                        label = "firmware";
-                       compatible = "sge,uimage";
+                       compatible = "openwrt,uimage", "denx,uimage";
+                       openwrt,padding = <96>;
                        reg = <0x180000 0x2800000>;
                };
 
@@ -101,7 +129,6 @@
 
                partition@4980000 {
                        label = "firmware2";
-                       compatible = "sge,uimage";
                        reg = <0x4980000 0x2800000>;
                };
 
@@ -127,7 +154,8 @@
        wifi0: wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x0000>;
+               nvmem-cells = <&macaddr_factory_e000 1>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <2400000 2500000>;
 
                led {
@@ -140,7 +168,8 @@
        wifi1: wifi@0,0 {
                compatible = "mediatek,mt76";
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&factory 0x8000>;
+               nvmem-cells = <&macaddr_factory_e000 2>;
+               nvmem-cell-names = "eeprom";
                ieee80211-freq-limit = <5000000 6000000>;
 
                led {
@@ -150,7 +179,23 @@
 };
 
 &gmac0 {
-       mtd-mac-address = <&factory 0xe000>;
+       nvmem-cells = <&macaddr_factory_e000 0>;
+       nvmem-cell-names = "mac-address";
+};
+
+&gmac1 {
+       status = "okay";
+       label = "wan";
+       phy-handle = <&ethphy4>;
+
+       nvmem-cells = <&macaddr_factory_e006>;
+       nvmem-cell-names = "mac-address";
+};
+
+&mdio {
+       ethphy4: ethernet-phy@4 {
+               reg = <4>;
+       };
 };
 
 &switch0 {
@@ -174,12 +219,6 @@
                        status = "okay";
                        label = "lan1";
                };
-
-               port@4 {
-                       status = "okay";
-                       label = "wan";
-                       mtd-mac-address = <&factory 0xe006>;
-               };
        };
 };