ramips: clean up useless dts partition labels

[openwrt/staging/jow.git] / target / linux / ramips / dts / mt7621_mediatek_ap-mt7621a-v60.dts

diff --git a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
index 3ca08be4b0bfae9ef7589c325bb95e7fc9c4e86b..aaa75b057320dab7440d12f51584f840229527c8 100644 (file)
--- a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
+++ b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
@@ -1,15 +1,9 @@
-/dts-v1/;
-
 #include "mt7621.dtsi"
 
 / {
        compatible = "mediatek,ap-mt7621a-v60", "mediatek,mt7621-soc";
        model = "Mediatek AP-MT7621A-V60 EVB";
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        sound {
                compatible = "simple-audio-card";
                simple-audio-card,name = "Audio-I2S";
@@ -38,7 +32,7 @@
 
 &state_default {
        gpio {
-               groups = "uart2", "rgmii2";
+               groups = "uart2";
                function = "gpio";
        };
 };
@@ -79,7 +73,7 @@
 
        flash@0 {
                compatible = "mx25l6405d","jedec,spi-nor";
-               reg = <0 0>;
+               reg = <0>;
                spi-max-frequency = <10000000>;
 
                partitions {
@@ -99,10 +93,22 @@
                                read-only;
                        };
 
-                       factory: partition@40000 {
+                       partition@40000 {
                                label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       macaddr_factory_5: macaddr@5 {
+                                               compatible = "mac-base";
+                                               reg = <0x5 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
                        };
 
                        partition@50000 {
@@ -119,7 +125,23 @@
 };
 
 &gmac0 {
-       mtd-mac-address = <&factory 0x5>;
+       nvmem-cells = <&macaddr_factory_5 0>;
+       nvmem-cell-names = "mac-address";
+};
+
+&gmac1 {
+       status = "okay";
+       label = "wan";
+       phy-handle = <&ethphy4>;
+
+       nvmem-cells = <&macaddr_factory_5 1>;
+       nvmem-cell-names = "mac-address";
+};
+
+&mdio {
+       ethphy4: ethernet-phy@4 {
+               reg = <4>;
+       };
 };
 
 &switch0 {
@@ -143,13 +165,6 @@
                        status = "okay";
                        label = "lan4";
                };
-
-               port@4 {
-                       status = "okay";
-                       label = "wan";
-                       mtd-mac-address = <&factory 0x5>;
-                       mtd-mac-address-increment = <1>;
-               };
        };
 };