ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-22 15:02:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ipq806x: Stabilize LAN 2 MAC address, interface ordering

Browse Source 
Part 1 of #13629 split.

* Sets the LAN 2 MAC address in the DTS by deriving it from LAN 1's
address. The factory OS derives this from the `eth1addr` u-boot env
variable, but the nvmem_u-boot-env driver doesn't support parsing MAC
addresses from fields other than `ethaddr`. But for all of the device
samples I've checked (~10) it derives the correct MAC.

* Updates 02_network to ensure that interfaces are assigned to roles
correctly and consistently.

Signed-off-by: Bryan Berg <bdb@north-eastham.org>
This commit is contained in:
Bryan Berg 2023-11-26 13:34:01 -08:00 committed by Christian Marangi
parent c2c741ccce
commit 84a489b7cf
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ipq806x/base-files/etc/board.d/02_network
View File

@ -46,8 +46,7 @@ ipq806x_setup_interfaces()
ucidef_set_network_device_conduit "lan1" "eth1"
ucidef_set_network_device_conduit "wan" "eth0"
;;
edgecore,ecw5410 |\
extreme,ap3935)
edgecore,ecw5410)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
;;
qcom,ipq8064-ap161)
@ -63,6 +62,7 @@ ipq806x_setup_interfaces()
meraki,mr42)
ucidef_set_interface_lan "eth0"
;;
extreme,ap3935 |\
meraki,mr52)
ucidef_set_interfaces_lan_wan "eth0" "eth1"
;;

6
target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ap3935.dts
View File

@ -195,6 +195,7 @@
reg = <0x2a0000 0x0010000>;
ethaddr: ethaddr {
#nvmem-cell-cells = <1>;
};
};
@ -327,7 +328,7 @@
phy-mode = "rgmii";
phy-handle = <&phy1>;
nvmem-cells = <&ethaddr>;
nvmem-cells = <&ethaddr 0>;
nvmem-cell-names = "mac-address";
fixed-link {
@ -344,6 +345,9 @@
phy-mode = "sgmii";
phy-handle = <&phy2>;
nvmem-cells = <&ethaddr 1>;
nvmem-cell-names = "mac-address";
};
&adm_dma {