aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2019-10-31 13:03:49 +0100
committerJohn Crispin <john@phrozen.org>2019-11-02 20:51:56 +0100
commit999504ff65a24baf9e022883a63e2e862e0b6aae (patch)
tree6d5f37eab2d34d21acee45c556e440670d1128a7
parentdc90caf45a25ae34e5f935cfef17584bf6878087 (diff)
downloadupstream-999504ff65a24baf9e022883a63e2e862e0b6aae.tar.gz
upstream-999504ff65a24baf9e022883a63e2e862e0b6aae.tar.bz2
upstream-999504ff65a24baf9e022883a63e2e862e0b6aae.zip
ath79: remove further redundant mtd-mac-address for wmac
For several devices, wmac MAC address is set from art 0x1002 explicitly by using mtd-mac-address although mtd-cal-data is pulled from art 0x1000. With the MAC address in 0x1002, the driver should automatically use it when reading caldata from 0x1000. Thus, remove the redundant mtd-mac-address for those devices. This patch addresses the cases where the calibration data partition is not labelled art, having been overlooked in the first patch. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rw-r--r--target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts1
-rw-r--r--target/linux/ath79/dts/ar9342_ubnt_wa.dtsi1
-rw-r--r--target/linux/ath79/dts/ar9342_ubnt_xw.dtsi1
-rw-r--r--target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts1
4 files changed, 0 insertions, 4 deletions
diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts
index 2ace37ad68..b591925154 100644
--- a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts
+++ b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts
@@ -74,5 +74,4 @@
status = "okay";
mtd-cal-data = <&eeprom 0x1000>;
- mtd-mac-address = <&eeprom 0x1002>;
};
diff --git a/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi b/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
index df5cb4be69..30fa299638 100644
--- a/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
+++ b/target/linux/ath79/dts/ar9342_ubnt_wa.dtsi
@@ -89,5 +89,4 @@
qca,disable-5ghz;
mtd-cal-data = <&eeprom 0x1000>;
- mtd-mac-address = <&eeprom 0x1002>;
};
diff --git a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
index 76c5c5efca..24fe34b3a7 100644
--- a/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
+++ b/target/linux/ath79/dts/ar9342_ubnt_xw.dtsi
@@ -116,7 +116,6 @@
status = "okay";
mtd-cal-data = <&eeprom 0x1000>;
- mtd-mac-address = <&eeprom 0x1002>;
};
&eth0 {
diff --git a/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts b/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts
index 590ec448e9..629899e1a2 100644
--- a/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts
+++ b/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts
@@ -95,5 +95,4 @@
&wmac {
status = "okay";
mtd-cal-data = <&eeprom 0x1000>;
- mtd-mac-address = <&eeprom 0x1002>;
};