ramips: Fix Hongdian H7920 v40 mac address

After extracting the EEPROMs of different devices, only the 0x4 address is unique.

Use the 0x4 address as the LAN address, and the LAN+1 address as the WAN address.

Signed-off-by: Coia Prant <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20256
(cherry picked from commit c907c7c9b3f0b66bbafc75a2ae1111fbf873a1c3)
Link: https://github.com/openwrt/openwrt/pull/20257
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/ramips/dts/mt7628an_hongdian_h7920-v40.dts b/target/linux/ramips/dts/mt7628an_hongdian_h7920-v40.dts
index 6c165fc3bfd1531d9867d80c7eb40892c258a3fe..d29b131aa6e332af3ce1471e77596f7bc3c301bc 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_hongdian_h7920-v40.dts
+++ b/target/linux/ramips/dts/mt7628an_hongdian_h7920-v40.dts
@@ -123,8 +123,8 @@
                                                reg = <0x0 0x400>;
                                        };
 
-                                       macaddr_factory_28: macaddr@28 {
-                                               reg = <0x28 0x6>;
+                                       macaddr_factory_4: macaddr@4 {
+                                               reg = <0x4 0x6>;
                                        };
                                };
                        };
@@ -146,7 +146,7 @@
 };
 
 &ethernet {
-       nvmem-cells = <&macaddr_factory_28>;
+       nvmem-cells = <&macaddr_factory_4>;
        nvmem-cell-names = "mac-address";
 };
 

diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
index 372821c3b8ebe365044dec7f8305f3e27791fcb1..a7adc2d71261ccdd4e0f7845b6d0a6defc26a466 100644 (file)
--- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
@@ -257,6 +257,7 @@ ramips_setup_macs()
                label_mac=$(mtd_get_mac_binary factory 0x4)
                ;;
        duzun,dm06|\
+       hongdian,h7920-v40|\
        netgear,r6020|\
        netgear,r6080|\
        netgear,r6120|\
@@ -278,7 +279,6 @@ ramips_setup_macs()
        totolink,a3)
                wan_mac=$(mtd_get_mac_binary u-boot 0x1fc40)
                ;;
-       hongdian,h7920-v40|\
        jotale,js76x8-8m|\
        jotale,js76x8-16m|\
        jotale,js76x8-32m|\