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>

diff --git a/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts b/target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts
index 2ace37ad687f2f3fa722b03e1e3bfd5533324a98..b59192515414a8155a4ea5146a751d8b9151b6d0 100644 (file)
--- 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>;
        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 df5cb4be699dee6166a4c7f8daac285f7c9d5d50..30fa299638c49969487502d34d486ce3e523f0c0 100644 (file)
--- 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>;
 
        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 76c5c5efcaf55a57bb8d2353c51efc1dec27e2cc..24fe34b3a77bc92bcb8910c444f382e89825b4a6 100644 (file)
--- 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>;
        status = "okay";
 
        mtd-cal-data = <&eeprom 0x1000>;

-       mtd-mac-address = <&eeprom 0x1002>;

 };
 
 &eth0 {
 };
 
 &eth0 {

diff --git a/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts b/target/linux/ath79/dts/qca9533_ubnt_acb-isp.dts
index 590ec448e9434d7f4cac106c09df00540ea8bab1..629899e1a24a7fc87654d17d326d9be5b05be9fe 100644 (file)
--- 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>;
 &wmac {
        status = "okay";
        mtd-cal-data = <&eeprom 0x1000>;

-       mtd-mac-address = <&eeprom 0x1002>;

 };
 };