Skip to content

Commit 86f489c

Browse files
nehebhauke
authored andcommitted
ath79: remove wmac mac address defaults
1002 and 5006 are default addresses as part of the calibration data. Don't bother specifying them explicitly. Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: openwrt/openwrt#17082 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
1 parent dde510c commit 86f489c

File tree

6 files changed

+14
-34
lines changed

6 files changed

+14
-34
lines changed

target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@
116116
macaddr_art_0: macaddr@0 {
117117
reg = <0x0 0x6>;
118118
};
119-
120-
macaddr_art_1002: macaddr@1002 {
121-
reg = <0x1002 0x6>;
122-
};
123119
};
124120
};
125121

@@ -143,6 +139,6 @@
143139
&wmac {
144140
status = "okay";
145141

146-
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
147-
nvmem-cell-names = "calibration", "mac-address";
142+
nvmem-cells = <&cal_art_1000>;
143+
nvmem-cell-names = "calibration";
148144
};

target/linux/ath79/dts/ar9344_alfa-network_n5q.dts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,6 @@
154154
macaddr_art_6: macaddr@6 {
155155
reg = <0x6 0x6>;
156156
};
157-
158-
macaddr_art_1002: macaddr@1002 {
159-
reg = <0x1002 0x6>;
160-
};
161157
};
162158
};
163159

@@ -173,6 +169,6 @@
173169
&wmac {
174170
status = "okay";
175171

176-
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
177-
nvmem-cell-names = "calibration", "mac-address";
172+
nvmem-cells = <&cal_art_1000>;
173+
nvmem-cell-names = "calibration";
178174
};

target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@
122122
&wmac {
123123
status = "okay";
124124

125-
nvmem-cells = <&macaddr_art_1002 0>, <&calibration_art_1000>;
126-
nvmem-cell-names = "mac-address", "calibration";
125+
nvmem-cells = <&calibration_art_1000>;
126+
nvmem-cell-names = "calibration";
127127
};
128128

129129
&pcie {

target/linux/ath79/dts/qca9531_alcatel_hh40v.dts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,6 @@
140140
macaddr_art_6: macaddr@6 {
141141
reg = <0x6 0x6>;
142142
};
143-
144-
macaddr_art_1002: macaddr@1002 {
145-
reg = <0x1002 0x6>;
146-
};
147143
};
148144
};
149145
};
@@ -174,6 +170,6 @@
174170
&wmac {
175171
status = "okay";
176172

177-
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>;
178-
nvmem-cell-names = "calibration", "mac-address";
173+
nvmem-cells = <&cal_art_1000>;
174+
nvmem-cell-names = "calibration";
179175
};

target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,6 @@
124124
&wmac {
125125
status = "okay";
126126

127-
nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002 0>;
128-
nvmem-cell-names = "calibration", "mac-address";
127+
nvmem-cells = <&cal_art_1000>;
128+
nvmem-cell-names = "calibration";
129129
};

target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,6 @@
111111
macaddr_art_0: macaddr@0 {
112112
reg = <0x0 0x6>;
113113
};
114-
115-
macaddr_art_1002: macaddr@1002 {
116-
reg = <0x1002 0x6>;
117-
};
118-
119-
macaddr_art_5006: macaddr@5006 {
120-
reg = <0x5006 0x6>;
121-
};
122114
};
123115
};
124116

@@ -182,8 +174,8 @@
182174
compatible = "qcom,ath10k";
183175
reg = <0 0 0 0 0>;
184176

185-
nvmem-cells = <&macaddr_art_5006>, <&calibration_ath10k>;
186-
nvmem-cell-names = "mac-address", "pre-calibration";
177+
nvmem-cells = <&calibration_ath10k>;
178+
nvmem-cell-names = "pre-calibration";
187179
};
188180
};
189181

@@ -206,6 +198,6 @@
206198
&wmac {
207199
status = "okay";
208200

209-
nvmem-cells = <&macaddr_art_1002>, <&calibration_ath9k>;
210-
nvmem-cell-names = "mac-address", "calibration";
201+
nvmem-cells = <&calibration_ath9k>;
202+
nvmem-cell-names = "calibration";
211203
};

0 commit comments

Comments
 (0)