[OpenWrt-Devel] [PATCH] ath79: remove redundant mtd-mac-address for wmac

[Jeff Kletsky]

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 at adrianschmutzler.de>
Tested-by: Jeff Kletsky <git-commits at 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>;
>   };

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel