ath79: remove 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.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-by: Jeff Kletsky <git-commits@allycomm.com>
Tested-by: Karl Palsson <karlp@etactica.com>

diff --git a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
index 8af378ef9296bd72e0310ca6f9d21a127808ba13..cc0320d65239c780b59e746716ea3735449b28c2 100644 (file)
--- a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
+++ b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
@@ -132,5 +132,4 @@
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x1002>;
 };

diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
index 311a506b5de7b9e5b064070570620edaa9a0e1bd..639c6523d62a686e3ca6e6994f9446752405d22f 100644 (file)
--- a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
+++ b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
@@ -116,5 +116,4 @@
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x1002>;
 };

diff --git a/target/linux/ath79/dts/ar9331_etactica_eg200.dts b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
index 5b9dbede970ba01513caa7305b341d85852e7086..079cc88767396a8323d5eaf4605d5bf345d2b41d 100644 (file)
--- a/target/linux/ath79/dts/ar9331_etactica_eg200.dts
+++ b/target/linux/ath79/dts/ar9331_etactica_eg200.dts
@@ -127,5 +127,4 @@
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x1002>;
 };

diff --git a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
index 79611a687d98d93efa86d9775e62581f5a49ca3f..a6348d4cbad57b5e0d0786ba6b716e2c1d767782 100644 (file)
--- a/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
+++ b/target/linux/ath79/dts/ar9341_pcs_cr3000.dts
@@ -139,7 +139,6 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x1002>;
 };
 
 &eth0 {

diff --git a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
index 8f8ae4afcf21e16ed7cd22888bce038fe9b506e2..65891010994ef76998e2d88882ee3ac43d443c14 100644 (file)
--- a/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
+++ b/target/linux/ath79/dts/ar9344_pcs_cr5000.dts
@@ -220,5 +220,4 @@
        status = "okay";
 
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x1002>;
 };

diff --git a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
index d98cbe566d0257e972ef4c2e039fefcfc2dc1b3a..57312f6ff4afa5b84796895627603f8b8e19e143 100644 (file)
--- a/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
+++ b/target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts
@@ -143,7 +143,6 @@
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x1002>;
 };
 
 &pinmux {

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
index b72aa65522df6381ccb968d49a097c84d7b0eec2..67a3331ab39826997b5a5a3c67f58e837d2446e3 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi
@@ -141,5 +141,4 @@
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x1002>;
 };

diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
index de28f6c3f0bd48b43a2a2e0d20e335f711372566..ae4553a2075ec0552d3eb318a96e076a58ae6963 100644 (file)
--- a/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-x750.dts
@@ -133,5 +133,4 @@
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x1002>;
 };

diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts
index 4f65b2d2e2923e630af743110be23e88349518ba..dc3ea24ae644c048f848d366e69d6a143f949aa7 100644 (file)
--- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts
+++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts
@@ -173,5 +173,4 @@
 &wmac {
        status = "okay";
        mtd-cal-data = <&art 0x1000>;
-       mtd-mac-address = <&art 0x1002>;
 };