Skip to content

Commit 5369699

Browse files
testuser7robimarko
authored andcommitted
qualcommax: ipq8072: partial revert NVMEM MAC addresses for Linksys MX5300
Partially revert commit e8c74e8. Assigning LAN MAC addresses incremented by one causes a conflict with the addresses for the 2.4G wireless interface. Additionally, invalid wireless network interface assignments are revoked. Retain the change setting label-mac-device to &swport5 WAN port Signed-off-by: Paweł Owoc <frut3k7@gmail.com> Link: openwrt/openwrt#25239 Signed-off-by: Robert Marko <robimarko@gmail.com>
1 parent d1ba111 commit 5369699

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

‎target/linux/qualcommax/dts/ipq8072-mx5300.dts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@
458458
phy-handle = <&qca8075_0>;
459459
phy-mode = "psgmii";
460460
pcs-handle = <&uniphy0 0>;
461-
nvmem-cells = <&hw_mac_addr 1>;
461+
nvmem-cells = <&hw_mac_addr 0>;
462462
nvmem-cell-names = "mac-address";
463463
};
464464

@@ -468,7 +468,7 @@
468468
phy-handle = <&qca8075_1>;
469469
phy-mode = "psgmii";
470470
pcs-handle = <&uniphy0 1>;
471-
nvmem-cells = <&hw_mac_addr 1>;
471+
nvmem-cells = <&hw_mac_addr 0>;
472472
nvmem-cell-names = "mac-address";
473473
};
474474

@@ -478,7 +478,7 @@
478478
phy-handle = <&qca8075_2>;
479479
phy-mode = "psgmii";
480480
pcs-handle = <&uniphy0 2>;
481-
nvmem-cells = <&hw_mac_addr 1>;
481+
nvmem-cells = <&hw_mac_addr 0>;
482482
nvmem-cell-names = "mac-address";
483483
};
484484

@@ -488,7 +488,7 @@
488488
phy-handle = <&qca8075_3>;
489489
phy-mode = "psgmii";
490490
pcs-handle = <&uniphy0 3>;
491-
nvmem-cells = <&hw_mac_addr 1>;
491+
nvmem-cells = <&hw_mac_addr 0>;
492492
nvmem-cell-names = "mac-address";
493493
};
494494

@@ -539,8 +539,8 @@
539539
reg = <0x00010000 0 0 0 0>;
540540

541541
qcom,ath10k-calibration-variant = "Linksys-MX5300";
542-
nvmem-cell-names = "pre-calibration", "mac-address";
543-
nvmem-cells = <&caldata_qca9984>, <&hw_mac_addr 2>;
542+
nvmem-cell-names = "pre-calibration";
543+
nvmem-cells = <&caldata_qca9984>;
544544
};
545545
};
546546
};
@@ -549,6 +549,4 @@
549549
status = "okay";
550550

551551
qcom,ath11k-calibration-variant = "Linksys-MX5300";
552-
nvmem-cells = <&hw_mac_addr 3>;
553-
nvmem-cell-names = "mac-address";
554552
};

0 commit comments

Comments
 (0)