From: Rosen Penev Date: Sun, 23 Jun 2024 19:25:34 +0000 (-0700) Subject: ath79: remove wmac mac address defaults X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=86f489c02f8250fc898a269e2e8ae9baa7ac4524;p=openwrt%2Fstaging%2Fstintel.git ath79: remove wmac mac address defaults 1002 and 5006 are default addresses as part of the calibration data. Don't bother specifying them explicitly. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/17082 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi index ca0b4131ac..2d9e17bcf8 100644 --- a/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi +++ b/target/linux/ath79/dts/ar9331_alfa-network_ap121f.dtsi @@ -116,10 +116,6 @@ macaddr_art_0: macaddr@0 { reg = <0x0 0x6>; }; - - macaddr_art_1002: macaddr@1002 { - reg = <0x1002 0x6>; - }; }; }; @@ -143,6 +139,6 @@ &wmac { status = "okay"; - nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>; - nvmem-cell-names = "calibration", "mac-address"; + nvmem-cells = <&cal_art_1000>; + nvmem-cell-names = "calibration"; }; diff --git a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts index 9f4c95c3d4..8dfcd2ee3a 100644 --- a/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts +++ b/target/linux/ath79/dts/ar9344_alfa-network_n5q.dts @@ -154,10 +154,6 @@ macaddr_art_6: macaddr@6 { reg = <0x6 0x6>; }; - - macaddr_art_1002: macaddr@1002 { - reg = <0x1002 0x6>; - }; }; }; @@ -173,6 +169,6 @@ &wmac { status = "okay"; - nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>; - nvmem-cell-names = "calibration", "mac-address"; + nvmem-cells = <&cal_art_1000>; + nvmem-cell-names = "calibration"; }; diff --git a/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts b/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts index a5d684cf99..e2bfd54842 100644 --- a/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts +++ b/target/linux/ath79/dts/ar9344_embeddedwireless_balin.dts @@ -122,8 +122,8 @@ &wmac { status = "okay"; - nvmem-cells = <&macaddr_art_1002 0>, <&calibration_art_1000>; - nvmem-cell-names = "mac-address", "calibration"; + nvmem-cells = <&calibration_art_1000>; + nvmem-cell-names = "calibration"; }; &pcie { diff --git a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts index c68b49d6c2..16ba785a23 100644 --- a/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts +++ b/target/linux/ath79/dts/qca9531_alcatel_hh40v.dts @@ -140,10 +140,6 @@ macaddr_art_6: macaddr@6 { reg = <0x6 0x6>; }; - - macaddr_art_1002: macaddr@1002 { - reg = <0x1002 0x6>; - }; }; }; }; @@ -174,6 +170,6 @@ &wmac { status = "okay"; - nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002>; - nvmem-cell-names = "calibration", "mac-address"; + nvmem-cells = <&cal_art_1000>; + nvmem-cell-names = "calibration"; }; diff --git a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi index 13a2e28619..48f2eff86a 100644 --- a/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi +++ b/target/linux/ath79/dts/qca9531_alfa-network_r36a.dtsi @@ -124,6 +124,6 @@ &wmac { status = "okay"; - nvmem-cells = <&cal_art_1000>, <&macaddr_art_1002 0>; - nvmem-cell-names = "calibration", "mac-address"; + nvmem-cells = <&cal_art_1000>; + nvmem-cell-names = "calibration"; }; diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi b/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi index ab1f8902b1..5f1ef04f0b 100644 --- a/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi +++ b/target/linux/ath79/dts/qca9563_glinet_gl-x1200.dtsi @@ -111,14 +111,6 @@ macaddr_art_0: macaddr@0 { reg = <0x0 0x6>; }; - - macaddr_art_1002: macaddr@1002 { - reg = <0x1002 0x6>; - }; - - macaddr_art_5006: macaddr@5006 { - reg = <0x5006 0x6>; - }; }; }; @@ -182,8 +174,8 @@ compatible = "qcom,ath10k"; reg = <0 0 0 0 0>; - nvmem-cells = <&macaddr_art_5006>, <&calibration_ath10k>; - nvmem-cell-names = "mac-address", "pre-calibration"; + nvmem-cells = <&calibration_ath10k>; + nvmem-cell-names = "pre-calibration"; }; }; @@ -206,6 +198,6 @@ &wmac { status = "okay"; - nvmem-cells = <&macaddr_art_1002>, <&calibration_ath9k>; - nvmem-cell-names = "mac-address", "calibration"; + nvmem-cells = <&calibration_ath9k>; + nvmem-cell-names = "calibration"; };