ath79: fix label-mac-device for wmac

It appears 683-of_net-add-mac-address-to-of-tree.patch relies on the
mac-address nvmem property being present. wmac itself doesn't need it as
it takes it from the eeprom but label-mac-device needs it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21035
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Rosen Penev
2025-12-03 19:15:05 -08:00
committed by Hauke Mehrtens
parent edac7d880a
commit f70e786a7c
9 changed files with 46 additions and 18 deletions
@@ -109,6 +109,10 @@
macaddr_art_0: macaddr@0 {
reg = <0x0 0x6>;
};
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};
};
@@ -132,8 +136,8 @@
&wmac {
status = "okay";
nvmem-cells = <&cal_art_1000>;
nvmem-cell-names = "calibration";
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
nvmem-cell-names = "calibration", "mac-address";
led {
led-sources = <0>;
@@ -116,6 +116,10 @@
cal_art_1000: calibration@1000 {
reg = <0x1000 0x440>;
};
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};
};
};
@@ -135,6 +139,6 @@
&wmac {
status = "okay";
nvmem-cells = <&cal_art_1000>;
nvmem-cell-names = "calibration";
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
nvmem-cell-names = "calibration", "mac-address";
};
+6 -2
View File
@@ -79,6 +79,10 @@
calibration_art_1000: calibration@1000 {
reg = <0x1000 0x440>;
};
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};
};
};
@@ -88,8 +92,8 @@
&wmac {
status = "okay";
nvmem-cells = <&calibration_art_1000>;
nvmem-cell-names = "calibration";
nvmem-cells = <&calibration_art_1000>, <&macaddr_art_1002>;
nvmem-cell-names = "calibration", "mac-address";
};
&eth0 {
@@ -146,6 +146,10 @@
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};
};
@@ -165,8 +169,8 @@
&wmac {
status = "okay";
nvmem-cells = <&cal_art_1000>;
nvmem-cell-names = "calibration";
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
nvmem-cell-names = "calibration", "mac-address";
led {
led-sources = <12>;
@@ -129,8 +129,8 @@
&wmac {
status = "okay";
nvmem-cells = <&cal_art_1000>;
nvmem-cell-names = "calibration";
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002 0>;
nvmem-cell-names = "calibration", "mac-address";
led {
led-sources = <13>;
@@ -87,6 +87,10 @@
cal_art_1000: calibration@1000 {
reg = <0x1000 0x440>;
};
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};
};
@@ -127,6 +131,6 @@
&wmac {
status = "okay";
nvmem-cells = <&cal_art_1000>;
nvmem-cell-names = "calibration";
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
nvmem-cell-names = "calibration", "mac-address";
};
@@ -132,6 +132,10 @@
macaddr_art_6: macaddr@6 {
reg = <0x6 0x6>;
};
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};
};
};
@@ -162,8 +166,8 @@
&wmac {
status = "okay";
nvmem-cells = <&cal_art_1000>;
nvmem-cell-names = "calibration";
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
nvmem-cell-names = "calibration", "mac-address";
led {
led-sources = <0>;
@@ -127,6 +127,6 @@
&wmac {
status = "okay";
nvmem-cells = <&cal_art_1000>;
nvmem-cell-names = "calibration";
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002 0>;
nvmem-cell-names = "calibration", "mac-address";
};
@@ -83,6 +83,10 @@
cal_art_1000: calibration@1000 {
reg = <0x1000 0x440>;
};
macaddr_art_1002: macaddr@1002 {
reg = <0x1002 0x6>;
};
};
};
};
@@ -110,6 +114,6 @@
&wmac {
status = "okay";
nvmem-cells = <&cal_art_1000>;
nvmem-cell-names = "calibration";
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
nvmem-cell-names = "calibration", "mac-address";
};