mediatek: add latest fixes provided by MTK

[openwrt/staging/jow.git] / target / linux / mediatek / files-4.19 / arch / arm / boot / dts / mt7629-rfb.dts

diff --git a/target/linux/mediatek/files-4.19/arch/arm/boot/dts/mt7629-rfb.dts b/target/linux/mediatek/files-4.19/arch/arm/boot/dts/mt7629-rfb.dts
index 8043238fea89a1546f95dc9e2812deb59d064b0b..8ea7b163d8d7d3049a9d8bed7fc9549420c71b15 100644 (file)
--- a/target/linux/mediatek/files-4.19/arch/arm/boot/dts/mt7629-rfb.dts
+++ b/target/linux/mediatek/files-4.19/arch/arm/boot/dts/mt7629-rfb.dts
@@ -10,7 +10,7 @@
 
 / {
        model = "MediaTek MT7629 reference board";
-       compatible = "mediatek,mt7629-rfb", "mediatek,mt7629";
+       compatible = "mediatek,mt7629-lynx-rfb", "mediatek,mt7629";
 
        aliases {
                serial0 = &uart0;
@@ -18,6 +18,7 @@
 
        chosen {
                stdout-path = "serial0:115200n8";
+               bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n8";
        };
 
        gpio-keys {
@@ -36,6 +37,13 @@
                };
        };
 
+       gsw: gsw@0 {
+               compatible = "mediatek,mt753x";
+               mediatek,ethsys = <&ethsys>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+       };
+
        memory@40000000 {
                device_type = "memory";
                reg = <0 0x40000000 0 0x10000000>;
@@ -58,46 +66,61 @@
                regulator-boot-on;
                regulator-always-on;
        };
-
-        rtkgsw: rtkgsw@0 {
-                compatible = "mediatek,rtk-gsw";
-                mediatek,ethsys = <&ethsys>;
-               mediatek,mdio = <&mdio>;
-                status = "okay";
-        };
 };
 
 &eth {
-        pinctrl-names = "default";
-        pinctrl-0 = <&ephy_leds_pins>;
-        status = "okay";
-
-        gmac0: mac@0 {
-                compatible = "mediatek,eth-mac";
-                reg = <0>;
-                phy-mode = "sgmii";
-                fixed-link {
-                        speed = <1000>;
-                        full-duplex;
-                        pause;
-                };
-        };
-
-        gmac1: mac@1 {
-                compatible = "mediatek,eth-mac";
-                reg = <1>;
-                phy-handle = <&phy0>;
-        };
-
-        mdio: mdio-bus {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                phy0: ethernet-phy@0 {
-                        reg = <0>;
-                        phy-mode = "gmii";
-                };
-        };
+       pinctrl-names = "default";
+       pinctrl-0 = <&ephy_leds_pins>;
+       status = "okay";
+
+       gmac0: mac@0 {
+               compatible = "mediatek,eth-mac";
+               reg = <0>;
+               mtd-mac-address = <&factory 0x2a>;
+               phy-mode = "sgmii";
+               fixed-link {
+                       speed = <1000>;
+                       full-duplex;
+                       pause;
+               };
+       };
+
+       gmac1: mac@1 {
+               compatible = "mediatek,eth-mac";
+               reg = <1>;
+               mtd-mac-address = <&factory 0x24>;
+               phy-handle = <&phy0>;
+       };
+
+       mdio: mdio-bus {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               phy0: ethernet-phy@0 {
+                       reg = <0>;
+                       phy-mode = "gmii";
+               };
+       };
+};
+
+&gsw {
+       mediatek,mdio = <&mdio>;
+       mediatek,portmap = "llllw";
+       mediatek,mdio_master_pinmux = <0>;
+       reset-gpios = <&pio 28 0>;
+       interrupt-parent = <&pio>;
+       interrupts = <6 IRQ_TYPE_LEVEL_HIGH>;
+       status = "okay";
+
+       port6: port@6 {
+               compatible = "mediatek,mt753x-port";
+               reg = <6>;
+               phy-mode = "sgmii";
+               fixed-link {
+                       speed = <2500>;
+                       full-duplex;
+               };
+       };
 };
 
 &i2c {
@@ -133,13 +156,13 @@
                        };
 
                        factory: partition@70000 {
-                               label = "Factory";
+                               label = "factory";
                                reg = <0x70000 0x40000>;
                                read-only;
                        };
 
                        partition@b0000 {
-                               label = "Kernel";
+                               label = "firmware";
                                reg = <0xb0000 0xb50000>;
                        };
                };