From 879af72b48d7564744f1629ef73b1ecad90302dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Owoc?= Date: Fri, 1 Mar 2024 23:56:36 +0100 Subject: [PATCH] qualcommax: ipq807x: Fix MAC addresses usage for RAX120v2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Currently, 6 MAC addresses are read from the "boarddata1" partition and set for network interfaces in sequence. This partition only contains 3 MAC addresses: 1. lan mac 2. wan mac 3. wlan5g mac As result only lan2, lan3 and lan4 have correct (OUI) MAC addresses. lan1, lan5 and wan interfaces get MAC addresses with incorrect OUI from random data on "boarddata1" partition. This commit fix this and use first MAC for lan and second MAC for wan interfaces. Signed-off-by: Paweł Owoc --- .../arm64/boot/dts/qcom/ipq8074-rax120v2.dts | 32 ++++++------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts index 0be50603ba59..ceb47f14fdd0 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts @@ -19,7 +19,7 @@ led-running = &led_system_white; led-upgrade = &led_system_white; led-internet = &led_wan_white; - label-mac-device = &dp1; + label-mac-device = &dp5; }; chosen { @@ -236,7 +236,7 @@ status = "okay"; phy-handle = <&qca8075_0>; label = "lan4"; - nvmem-cells = <&macaddr_dp1>; + nvmem-cells = <&macaddr_lan>; nvmem-cell-names = "mac-address"; }; @@ -244,7 +244,7 @@ status = "okay"; phy-handle = <&qca8075_1>; label = "lan3"; - nvmem-cells = <&macaddr_dp2>; + nvmem-cells = <&macaddr_lan>; nvmem-cell-names = "mac-address"; }; @@ -252,7 +252,7 @@ status = "okay"; phy-handle = <&qca8075_2>; label = "lan2"; - nvmem-cells = <&macaddr_dp3>; + nvmem-cells = <&macaddr_lan>; nvmem-cell-names = "mac-address"; }; @@ -260,7 +260,7 @@ status = "okay"; phy-handle = <&qca8075_3>; label = "lan1"; - nvmem-cells = <&macaddr_dp4>; + nvmem-cells = <&macaddr_lan>; nvmem-cell-names = "mac-address"; }; @@ -268,7 +268,7 @@ status = "okay"; phy-handle = <&qca8075_4>; label = "wan"; - nvmem-cells = <&macaddr_dp5>; + nvmem-cells = <&macaddr_wan>; nvmem-cell-names = "mac-address"; }; @@ -277,7 +277,7 @@ phy-mode = "usxgmii"; phy-handle = <&aqr111b0>; label = "lan5"; - nvmem-cells = <&macaddr_dp6_syn>; + nvmem-cells = <&macaddr_lan>; nvmem-cell-names = "mac-address"; }; @@ -445,29 +445,17 @@ #address-cells = <1>; #size-cells = <1>; - macaddr_dp1: macaddr@0 { + macaddr_lan: macaddr@0 { reg = <0x0 0x6>; }; - macaddr_dp2: macaddr@1 { + macaddr_wan: macaddr@1 { reg = <0x6 0x6>; }; - macaddr_dp3: macaddr@2 { + macaddr_wlan5g: macaddr@2 { reg = <0xc 0x6>; }; - - macaddr_dp4: macaddr@3 { - reg = <0x12 0x6>; - }; - - macaddr_dp5: macaddr@4 { - reg = <0x18 0x6>; - }; - - macaddr_dp6_syn: macaddr@5 { - reg = <0x1e 0x6>; - }; }; }; -- 2.30.2