Skip to content

Commit

Permalink
ipq40xx: Properly set MAC addresses for the EAP1300
Browse files Browse the repository at this point in the history
The code that was there was just taking whatever was left in the
registers, which was just wrong.  Set the addresses using the value from
the u-boot environment, the same way the OEM firmware does.

Signed-off-by: Corey Minyard <minyard@acm.org>
Link: openwrt/openwrt#15358
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Link: openwrt/openwrt#15402
Signed-off-by: Robert Marko <robimarko@gmail.com>
  • Loading branch information
cminyard authored and wang1zhen committed May 23, 2024
1 parent d103618 commit ac5c5eb
Showing 1 changed file with 11 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,13 @@
reg = <0x190000 0x1dc0000>;
};
partition9@1f50000 {
compatible = "u-boot,env";
label = "u-boot-env";
reg = <0x01f50000 0x00010000>;

macaddr_ubootenv_ethaddr: ethaddr {
#nvmem-cell-cells = <1>;
};
};
partition10@1f60000 {
label = "userconfig";
Expand All @@ -222,6 +227,8 @@
&swport5 {
status = "okay";
label = "lan";
nvmem-cell-names = "mac-address";
nvmem-cells = <&macaddr_ubootenv_ethaddr 0>;
};

&gmac {
Expand All @@ -234,14 +241,14 @@

&wifi0 {
status = "okay";
nvmem-cell-names = "pre-calibration";
nvmem-cells = <&precal_art_1000>;
nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_1000>, <&macaddr_ubootenv_ethaddr 1>;
qcom,ath10k-calibration-variant = "EnGenius-EAP1300";
};

&wifi1 {
status = "okay";
nvmem-cell-names = "pre-calibration";
nvmem-cells = <&precal_art_5000>;
nvmem-cell-names = "pre-calibration", "mac-address";
nvmem-cells = <&precal_art_5000>, <&macaddr_ubootenv_ethaddr 2>;
qcom,ath10k-calibration-variant = "EnGenius-EAP1300";
};

0 comments on commit ac5c5eb

Please sign in to comment.