From 58b0d3ecd66ef220101d1f4dfe550242d6004fce Mon Sep 17 00:00:00 2001
From: Chuanhong Guo <gch981213@gmail.com>
Date: Fri, 1 Nov 2019 11:12:26 +0800
Subject: [PATCH] mediatek: cosmetic fixes for mt7629-lynx-rfb

This patch did the following things:
1. rename device compatible string
2. add earlycon into cmdline
3. add mac address location according to mt7629 eeprom layout
4. rename mtd partitions
5. replace spaces for indentation with tabs

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
---
 .../arch/arm/boot/dts/mt7629-lynx-rfb.dts     | 69 ++++++++++---------
 1 file changed, 36 insertions(+), 33 deletions(-)

diff --git a/target/linux/mediatek/files-4.19/arch/arm/boot/dts/mt7629-lynx-rfb.dts b/target/linux/mediatek/files-4.19/arch/arm/boot/dts/mt7629-lynx-rfb.dts
index f3fadd301a..b8ef3ed557 100644
--- a/target/linux/mediatek/files-4.19/arch/arm/boot/dts/mt7629-lynx-rfb.dts
+++ b/target/linux/mediatek/files-4.19/arch/arm/boot/dts/mt7629-lynx-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";
 	};
 
 	gpio-keys {
@@ -68,36 +69,38 @@
 };
 
 &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 {
@@ -153,13 +156,13 @@
 			};
 
 			factory: partition@70000 {
-				label = "Factory";
+				label = "factory";
 				reg = <0x70000 0x40000>;
 				read-only;
 			};
 
 			partition@b0000 {
-				label = "Kernel";
+				label = "firmware";
 				reg = <0xb0000 0xb50000>;
 			};
 		};
-- 
2.30.2