[OpenWrt-Devel] ath79: remove redundant mtd-mac-address for wmac
diff mbox series

Message ID 20191025113837.2844-1-freifunk@adrianschmutzler.de
State Accepted
Delegated to: David Bauer
Headers show
Series
  • [OpenWrt-Devel] ath79: remove redundant mtd-mac-address for wmac
Related show

Commit Message

Adrian Schmutzler Oct. 25, 2019, 11:38 a.m. UTC
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>

---

Not tested on the devices affected by this patch, but obviously
tested quite often with other device support PRs prior to merge.
---
 target/linux/ath79/dts/ar9331_8dev_carambola2.dts        | 1 -
 target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts | 1 -
 target/linux/ath79/dts/ar9331_etactica_eg200.dts         | 1 -
 target/linux/ath79/dts/ar9341_pcs_cr3000.dts             | 1 -
 target/linux/ath79/dts/ar9344_pcs_cr5000.dts             | 1 -
 target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts      | 1 -
 target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi     | 1 -
 target/linux/ath79/dts/qca9531_glinet_gl-x750.dts        | 1 -
 target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts      | 1 -
 9 files changed, 9 deletions(-)

Comments

Adrian Schmutzler Oct. 25, 2019, 2:12 p.m. UTC | #1
> Adrian Schmutzler <freifunk@adrianschmutzler.de> wrote: 
> > 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: Karl Palsson <karlp@etactia.com> (etactica-eg200 only) 

Thanks for the Tested-by. Unfortunately, it was not picked up by Patchwork. Either the Message-ID was lost or (most probably) the mail was not plain-text.
I'd have resent myself, but it looks like your e-mail domain is wrong, and I didn't want to correct that myself.

Best

Adrian
Jeff Kletsky Oct. 25, 2019, 3:39 p.m. UTC | #2
On 10/25/19 4:38 AM, Adrian Schmutzler wrote:

> 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> GL-AR300M-NAND
>
> ---
>
> Not tested on the devices affected by this patch, but obviously
> tested quite often with other device support PRs prior to merge.
> ---
>   target/linux/ath79/dts/ar9331_8dev_carambola2.dts        | 1 -
>   target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts | 1 -
>   target/linux/ath79/dts/ar9331_etactica_eg200.dts         | 1 -
>   target/linux/ath79/dts/ar9341_pcs_cr3000.dts             | 1 -
>   target/linux/ath79/dts/ar9344_pcs_cr5000.dts             | 1 -
>   target/linux/ath79/dts/ar9344_zbtlink_zbt-wd323.dts      | 1 -
>   target/linux/ath79/dts/qca9531_glinet_gl-ar300m.dtsi     | 1 -
>   target/linux/ath79/dts/qca9531_glinet_gl-x750.dts        | 1 -
>   target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts      | 1 -
>   9 files changed, 9 deletions(-)
>
> diff --git a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
> index 8af378ef92..cc0320d652 100644
> --- 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 311a506b5d..639c6523d6 100644
> --- 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 5b9dbede97..079cc88767 100644
> --- 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 79611a687d..a6348d4cba 100644
> --- 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 8f8ae4afcf..6589101099 100644
> --- 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 d98cbe566d..57312f6ff4 100644
> --- 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 b72aa65522..67a3331ab3 100644
> --- 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 de28f6c3f0..ae4553a207 100644
> --- 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 4f65b2d2e2..dc3ea24ae6 100644
> --- 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>;
>   };
Adrian Schmutzler Oct. 25, 2019, 8:53 p.m. UTC | #3
> -----Original Message-----
> From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org]
> On Behalf Of Adrian Schmutzler
> Sent: Freitag, 25. Oktober 2019 13:39
> To: openwrt-devel@lists.openwrt.org
> Subject: [OpenWrt-Devel] [PATCH] 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>
> 

Resubmit of tested-by:

Tested-by: Karl Palsson <karlp@etactica.com>

Patch
diff mbox series

diff --git a/target/linux/ath79/dts/ar9331_8dev_carambola2.dts b/target/linux/ath79/dts/ar9331_8dev_carambola2.dts
index 8af378ef92..cc0320d652 100644
--- 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 311a506b5d..639c6523d6 100644
--- 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 5b9dbede97..079cc88767 100644
--- 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 79611a687d..a6348d4cba 100644
--- 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 8f8ae4afcf..6589101099 100644
--- 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 d98cbe566d..57312f6ff4 100644
--- 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 b72aa65522..67a3331ab3 100644
--- 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 de28f6c3f0..ae4553a207 100644
--- 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 4f65b2d2e2..dc3ea24ae6 100644
--- 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>;
 };