From: John Crispin <john@openwrt.org>
Date: Sun, 20 Jul 2014 17:30:28 +0000 (+0000)
Subject: ramips: fix mac address partitions on ASL-26555
X-Git-Tag: reboot~6460
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4d22954db073698b75e8af1f5d3572ae3d8e5f53;p=openwrt%2Fstaging%2Flynxis.git

ramips: fix mac address partitions on ASL-26555

ASL-26555 16MB: caldata is present on uboot-env and devdata, but the proper one seems to be the devdata, since mac address corresponds to Amper, the real manufacturer, meanwhile the caldata on  uboot-env corresponds to D-Link.
ASL-26555 8MB: caldata is only present on uboot-env, but its mac address corresponds to Alpha, the real manufacturer.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

SVN-Revision: 41768
---

diff --git a/target/linux/ramips/dts/ASL26555-16M.dts b/target/linux/ramips/dts/ASL26555-16M.dts
index bd45bc305b..74163c293e 100644
--- a/target/linux/ramips/dts/ASL26555-16M.dts
+++ b/target/linux/ramips/dts/ASL26555-16M.dts
@@ -31,7 +31,7 @@
 					reg = <0x30000 0x10000>;
 					read-only;
 				};
-				factory: partition@40000 {
+				partition@40000 {
 					label = "factory";
 					reg = <0x40000 0x10000>;
 					read-only;
@@ -69,7 +69,7 @@
 	};
 
 	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x4004>;
+		mtd-mac-address = <&devdata 0x4004>;
 	};
 
 	esw@10110000 {
diff --git a/target/linux/ramips/dts/ASL26555-8M.dts b/target/linux/ramips/dts/ASL26555-8M.dts
index d7e424d868..506f1471af 100644
--- a/target/linux/ramips/dts/ASL26555-8M.dts
+++ b/target/linux/ramips/dts/ASL26555-8M.dts
@@ -26,8 +26,8 @@
 					reg = <0x0 0x30000>;
 					read-only;
 				};
-				factory: partition@30000 {
-					label = "factory";
+				ubootenv: partition@30000 {
+					label = "uboot-env";
 					reg = <0x30000 0x10000>;
 					read-only;
 				};
@@ -64,18 +64,17 @@
 	};
 
 	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x4004>;
+		mtd-mac-address = <&ubootenv 0x4004>;
 	};
 
 	esw@10110000 {
 		ralink,portmap = <0x1e>;
 	};
 
-	/* devdata partition seems to be missing */
-/*	wmac@10180000 {
-		ralink,mtd-eeprom = <&devdata 0x4000>;
+	wmac@10180000 {
+		ralink,mtd-eeprom = <&ubootenv 0x4000>;
 	};
-*/
+
 	otg@101c0000 {
 		status = "okay";
 	};