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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41768 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ramips/dts/ASL26555-16M.dts b/target/linux/ramips/dts/ASL26555-16M.dts
index bd45bc3..74163c2 100644 (file)
--- 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 d7e424d..506f147 100644 (file)
--- 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";
        };