From c527073b38bed10479ed258f964a2948d78c6624 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Sun, 21 Jan 2024 16:51:16 -0500 Subject: [PATCH] ath79: fix mac address on eap2x5-1port devices Commit e816591e226a ("ath79: qca: convert to nvmem-layout") mistakenly switched the source of the mac address from the 'info' to 'art' partition. This patch updates all devices that share same 'parent' device tree file and was tested to fix the problem for eap225-outdoor-v3 - device that I actually own. Fixes: e816591e226a ("ath79: qca: convert to nvmem-layout") Signed-off-by: Nikolay Martynov [amend commit message] Signed-off-by: Sander Vanheule --- .../ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts | 6 ------ .../ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts | 6 ------ target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts | 6 ------ target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts | 6 ------ target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts | 6 ------ target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts | 6 ------ .../linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi | 12 ++++++++++++ 7 files changed, 12 insertions(+), 36 deletions(-) diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts index 9c1e82bf986..c3f1a130eb0 100644 --- a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts +++ b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v1.dts @@ -35,12 +35,6 @@ #address-cells = <1>; #size-cells = <1>; - macaddr_info_8: macaddr@8 { - compatible = "mac-base"; - reg = <0x8 0x6>; - #nvmem-cell-cells = <1>; - }; - precalibration_ath10k: pre-calibration@5000 { reg = <0x5000 0x2f20>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts index 73700b626f3..1fac6082cf2 100644 --- a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts +++ b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts @@ -35,12 +35,6 @@ #address-cells = <1>; #size-cells = <1>; - macaddr_info_8: macaddr@8 { - compatible = "mac-base"; - reg = <0x8 0x6>; - #nvmem-cell-cells = <1>; - }; - precalibration_ath10k: pre-calibration@5000 { reg = <0x5000 0x2f20>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts index 1e100b31a72..9d06a49626e 100644 --- a/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts +++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v1.dts @@ -56,12 +56,6 @@ #address-cells = <1>; #size-cells = <1>; - macaddr_info_8: macaddr@8 { - compatible = "mac-base"; - reg = <0x8 0x6>; - #nvmem-cell-cells = <1>; - }; - calibration_ath10k: calibration@5000 { reg = <0x5000 0x844>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts index 32fba980519..5139bc76702 100644 --- a/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts +++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v3.dts @@ -35,12 +35,6 @@ #address-cells = <1>; #size-cells = <1>; - macaddr_info_8: macaddr@8 { - compatible = "mac-base"; - reg = <0x8 0x6>; - #nvmem-cell-cells = <1>; - }; - precalibration_ath10k: pre-calibration@5000 { reg = <0x5000 0x2f20>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts index 1c48775cdff..6e7ba5fede4 100644 --- a/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts +++ b/target/linux/ath79/dts/qca9563_tplink_eap225-v4.dts @@ -35,12 +35,6 @@ #address-cells = <1>; #size-cells = <1>; - macaddr_info_8: macaddr@8 { - compatible = "mac-base"; - reg = <0x8 0x6>; - #nvmem-cell-cells = <1>; - }; - precalibration_ath10k: pre-calibration@5000 { reg = <0x5000 0x2f20>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts b/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts index e7f21fafa50..af133813e71 100644 --- a/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts +++ b/target/linux/ath79/dts/qca9563_tplink_eap245-v1.dts @@ -49,12 +49,6 @@ #address-cells = <1>; #size-cells = <1>; - macaddr_info_8: macaddr@8 { - compatible = "mac-base"; - reg = <0x8 0x6>; - #nvmem-cell-cells = <1>; - }; - calibration_ath10k: calibration@5000 { reg = <0x5000 0x844>; }; diff --git a/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi b/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi index 9e0b97fcbf3..3b36049d5e6 100644 --- a/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi +++ b/target/linux/ath79/dts/qca9563_tplink_eap2x5-1port.dtsi @@ -55,6 +55,18 @@ label = "info"; reg = <0x030000 0x010000>; read-only; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_info_8: macaddr@8 { + compatible = "mac-base"; + reg = <0x8 0x6>; + #nvmem-cell-cells = <1>; + }; + }; }; partition@40000 {