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 15a4d71c1bcd44d051c2934fd1698dbcc9a90c5f..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";
@@ -36,17 +30,18 @@
        };
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "uart2", "rgmii2";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "uart2";
+               function = "gpio";
        };
+};
+
+&pinctrl {
        i2s_pins: i2s {
                i2s {
-                       ralink,group = "uart3";
-                       ralink,function = "i2s";
+                       groups = "uart3";
+                       function = "i2s";
                };
        };
 };
@@ -76,9 +71,9 @@
 &spi0 {
        status = "okay";
 
-       mx25l6405d@0 {
+       flash@0 {
                compatible = "mx25l6405d","jedec,spi-nor";
-               reg = <0 0>;
+               reg = <0>;
                spi-max-frequency = <10000000>;
 
                partitions {
@@ -98,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 {
@@ -117,8 +124,48 @@
        status = "okay";
 };
 
-&ethernet {
-       mtd-mac-address = <&factory 0x5>;
+&gmac0 {
+       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 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "lan1";
+               };
+
+               port@1 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@2 {
+                       status = "okay";
+                       label = "lan3";
+               };
+
+               port@3 {
+                       status = "okay";
+                       label = "lan4";
+               };
+       };
 };
 
 &pcie {