ath79: consistently use "info" label for default-mac partition

The tp-link safeloader devices typically contain a partition
"default-mac" which stores the MAC addresses. It is followed by other
partitions containing device info, like

  {"default-mac", 0x610000, 0x00020},
  {"pin", 0x610100, 0x00020},
  {"product-info", 0x611100, 0x01000},

In DTS, we typically assign a 0x10000 sized partition for these,
which is mostly labelled "mac" or "info". In rarer cases, the
partitions have been enclosed in a larger "tplink" or "config"
partition.

However, when comparing different devices, the implementation appears
relatively arbitrary at the moment.
Thus, this PR aims at harmonizing these partitions by always using
the name "info" for the DTS partition containing "default-mac".
"info" is preferred over "mac" as we never just have "default-mac"
alone, but always some other device-info partitions as well.

While at it, this also establishes a similar partitioning for the
few devices where the "info" partitions are part of a bigger
unspecific "config" partition or similar.

Besides the harmonization itself, this also allows to merge a few
cases in 11-ath10k-caldata.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

1 files changed, 16 insertions, 4 deletions

diff --git a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
index 887b6eea5f..7c27c97934 100644
--- a/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
+++ b/target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
@@ -100,7 +100,7 @@
 	phy-handle = <&phy4>;
 	pll-data = <0x9e000000 0x80000101 0x80001313>;
 
-	mtd-mac-address = <&config 0x10008>;
+	mtd-mac-address = <&info 0x8>;
 
 	gmac-config {
 		device = <&gmac>;
@@ -144,9 +144,21 @@
 				reg = <0x020000 0xd70000>;
 			};
 
-			config: partition@d90000 {
+			partition@d90000 {
+				label = "partition-table";
+				reg = <0xd90000 0x010000>;
+				read-only;
+			};
+
+			info: partition@da0000 {
+				label = "info";
+				reg = <0xda0000 0x020000>;
+				read-only;
+			};
+
+			partition@dc0000 {
 				label = "config";
-				reg = <0xd90000 0x260000>;
+				reg = <0xdc0000 0x230000>;
 				read-only;
 			};
 
@@ -167,5 +179,5 @@
 	status = "okay";
 
 	mtd-cal-data = <&art 0x1000>;
-	mtd-mac-address = <&config 0x10008>;
+	mtd-mac-address = <&info 0x8>;
 };