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 <mar.kolya@gmail.com>
[amend commit message]
Signed-off-by: Sander Vanheule <sander@svanheule.net>

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 9c1e82bf986c7938b856fe1f6d9e56d017037fb9..c3f1a130eb02f5cce7dd7f15a27c65e7eb8401e2 100644 (file)
--- 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 73700b626f3ff0886ef93df9a835b5fd0fe7daec..1fac6082cf241b729176b8284f2f1ab40949dee1 100644 (file)
--- 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 1e100b31a72d6fba0b56ada102ae62df110af2f7..9d06a49626e2e1866a73cb0a63aa205d837825eb 100644 (file)
--- 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 32fba980519f75cf5ca5d03b3dd6842678400afa..5139bc767029479e86d0f5b111a0383e46cb17b4 100644 (file)
--- 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 1c48775cdffbb54f3a59d788689f2533cdb03d51..6e7ba5fede45e16d5096b04e3d06e2f164c11e0a 100644 (file)
--- 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 e7f21fafa50858d767194174a7d682d3b816fb7a..af133813e71e6c36834a2e7c529d94f31b098af0 100644 (file)
--- 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 9e0b97fcbf3321684780811546c2aa5554be6dbe..3b36049d5e65c5b33cbeb066f889be9291bcede3 100644 (file)
--- 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 {