treewide: use more descriptive names for concatenated partitions

A few devices in ath79 and ramips use mtd-concat to concatenate
individual partitions into a bigger "firmware" or "ubi" partition.

However, the original partitions are still present and visible,
and one can write to them directly although this might break the
actual virtual, concatenated partition.

As we cannot do much about the former, let's at least choose more
descriptive names than just "firmwareX" in order to indicate the
concatenation to the user. He might be less tempted into overwriting
a "fwconcat1" than a "firmware1", which might be perceived as an
alternate firmware for dual boot etc.

This applies the new naming consistently for all relevant devices,
i.e. fwconcatX for virtual "firmware" members and ubiconcatX for
"ubi" members.

While at it, use DT labels and label property consistently, and
also use consistent zero-based indexing.

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

13 files changed, 68 insertions, 68 deletions

diff --git a/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts b/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts
index aeb1e9e424..77b2f3fa1a 100644
--- a/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts
+++ b/target/linux/ath79/dts/ar7240_engenius_enh202-v1.dts
@@ -72,7 +72,7 @@
 	virtual_flash {
 		compatible = "mtd-concat";
 
-		devices = <&firmware1 &firmware2>;
+		devices = <&fwconcat0 &fwconcat1>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -128,8 +128,8 @@
 				read-only;
 			};
 
-			firmware2: partition@b0000 {
-				label = "firmware2";
+			fwconcat1: partition@b0000 {
+				label = "fwconcat1";
 				reg = <0xb0000 0xf0000>;
 			};
 
@@ -138,8 +138,8 @@
 				reg = <0x1a0000 0x10000>;
 			};
 
-			firmware1: partition@1b0000 {
-				label = "firmware1";
+			fwconcat0: partition@1b0000 {
+				label = "fwconcat0";
 				reg = <0x1b0000 0x4c0000>;
 			};
 
diff --git a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
index b530f6aa8a..4001897adf 100644
--- a/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
+++ b/target/linux/ath79/dts/ar7242_engenius_eap350-v1.dts
@@ -51,7 +51,7 @@
 	virtual_flash {
 		compatible = "mtd-concat";
 
-		devices = <&firmware1 &firmware2>;
+		devices = <&fwconcat0 &fwconcat1>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -107,8 +107,8 @@
 				read-only;
 			};
 
-			firmware2: partition@b0000 {
-				label = "firmware2";
+			fwconcat1: partition@b0000 {
+				label = "fwconcat1";
 				reg = <0xb0000 0xf0000>;
 			};
 
@@ -118,8 +118,8 @@
 				read-only;
 			};
 
-			firmware1: partition@1b0000 {
-				label = "firmware1";
+			fwconcat0: partition@1b0000 {
+				label = "fwconcat0";
 				reg = <0x1b0000 0x4c0000>;
 			};
 
diff --git a/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
index 8931a206ba..e73082267c 100644
--- a/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
+++ b/target/linux/ath79/dts/ar7242_engenius_ecb350-v1.dts
@@ -51,7 +51,7 @@
 	virtual_flash {
 		compatible = "mtd-concat";
 
-		devices = <&firmware1 &firmware2>;
+		devices = <&fwconcat0 &fwconcat1>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -107,8 +107,8 @@
 				read-only;
 			};
 
-			firmware2: partition@b0000 {
-				label = "firmware2";
+			fwconcat1: partition@b0000 {
+				label = "fwconcat1";
 				reg = <0xb0000 0xf0000>;
 			};
 
@@ -118,8 +118,8 @@
 				read-only;
 			};
 
-			firmware1: partition@1b0000 {
-				label = "firmware1";
+			fwconcat0: partition@1b0000 {
+				label = "fwconcat0";
 				reg = <0x1b0000 0x4c0000>;
 			};
 
diff --git a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts b/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
index e299c8529d..3121ec0e01 100644
--- a/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
+++ b/target/linux/ath79/dts/ar9341_engenius_eap300-v2.dts
@@ -52,7 +52,7 @@
 	virtual_flash {
 		compatible = "mtd-concat";
 
-		devices = <&firmware1 &firmware2>;
+		devices = <&fwconcat0 &fwconcat1>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -112,8 +112,8 @@
 				read-only;
 			};
 
-			firmware2: partition@b0000 {
-				label = "firmware2";
+			fwconcat1: partition@b0000 {
+				label = "fwconcat1";
 				reg = <0x0b0000 0x170000>;
 			};
 
@@ -123,8 +123,8 @@
 				read-only;
 			};
 
-			firmware1: partition@230000 {
-				label = "firmware1";
+			fwconcat0: partition@230000 {
+				label = "fwconcat0";
 				reg = <0x230000 0xbc0000>;
 			};
 
diff --git a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
index 94b079f94d..8b28d581b1 100644
--- a/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
+++ b/target/linux/ath79/dts/ar9341_engenius_ens202ext-v1.dts
@@ -62,7 +62,7 @@
 	virtual_flash {
 		compatible = "mtd-concat";
 
-		devices = <&firmware1 &firmware2>;
+		devices = <&fwconcat0 &fwconcat1>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -122,8 +122,8 @@
 				read-only;
 			};
 
-			firmware2: partition@b0000 {
-				label = "firmware2";
+			fwconcat1: partition@b0000 {
+				label = "fwconcat1";
 				reg = <0x0b0000 0x170000>;
 			};
 
@@ -132,8 +132,8 @@
 				reg = <0x220000 0x010000>;
 			};
 
-			firmware1: partition@230000 {
-				label = "firmware1";
+			fwconcat0: partition@230000 {
+				label = "fwconcat0";
 				reg = <0x230000 0xbc0000>;
 			};
 
diff --git a/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts b/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
index 3d9c6cb781..aaa4d1576b 100644
--- a/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
+++ b/target/linux/ath79/dts/ar9341_pisen_wmb001n.dts
@@ -96,7 +96,7 @@
 
 	virtual_flash {
 		compatible = "mtd-concat";
-		devices = <&fwpart1 &fwpart2>;
+		devices = <&fwconcat0 &fwconcat1>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -158,8 +158,8 @@
 				read-only;
 			};
 
-			fwpart1: partition@20000 {
-				label = "fwpart1";
+			fwconcat0: partition@20000 {
+				label = "fwconcat0";
 				reg = <0x20000 0xdc0000>;
 			};
 
@@ -168,8 +168,8 @@
 				reg = <0xde0000 0x10000>;
 			};
 
-			fwpart2: partition@df0000 {
-				label = "fwpart2";
+			fwconcat1: partition@df0000 {
+				label = "fwconcat1";
 				reg = <0xdf0000 0x1f0000>;
 			};
 
diff --git a/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts b/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts
index 7fb794f21c..a387cebefc 100644
--- a/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts
+++ b/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts
@@ -23,7 +23,7 @@
 
 	mtd-concat {
 		compatible = "mtd-concat";
-		devices = <&concat0 &concat1>;
+		devices = <&fwconcat0 &fwconcat1>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -166,8 +166,8 @@
 				read-only;
 			};
 
-			concat0: partition@230000 {
-				label = "concat0";
+			fwconcat0: partition@230000 {
+				label = "fwconcat0";
 				reg = <0x230000 0xdd0000>;
 			};
 		};
@@ -183,8 +183,8 @@
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			concat1: partition@0 {
-				label = "concat1";
+			fwconcat1: partition@0 {
+				label = "fwconcat1";
 				reg = <0x0 0x1000000>;
 			};
 		};
diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
index 92b0beccd7..26f9db5924 100644
--- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
@@ -82,7 +82,7 @@
 
 	ubi-concat {
 		compatible = "mtd-concat";
-		devices = <&ubipart0 &ubipart1>;
+		devices = <&ubiconcat0 &ubiconcat1>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -153,8 +153,8 @@
 			reg = <0x6c0000 0x400000>;
 		};
 
-		ubipart0: partition@ac0000 {
-			label = "ubipart0";
+		ubiconcat0: partition@ac0000 {
+			label = "ubiconcat0";
 			reg = <0xac0000 0x1500000>;
 		};
 
@@ -170,8 +170,8 @@
 			read-only;
 		};
 
-		ubipart1: partition@2000000 {
-			label = "ubipart1";
+		ubiconcat1: partition@2000000 {
+			label = "ubiconcat1";
 			reg = <0x2000000 0x6000000>;
 		};
 	};
diff --git a/target/linux/ath79/dts/qca9550_airtight_c-75.dts b/target/linux/ath79/dts/qca9550_airtight_c-75.dts
index 1bdbc86156..a766398971 100644
--- a/target/linux/ath79/dts/qca9550_airtight_c-75.dts
+++ b/target/linux/ath79/dts/qca9550_airtight_c-75.dts
@@ -44,7 +44,7 @@
 
 	virtual_flash {
 		compatible = "mtd-concat";
-		devices = <&concat0 &concat1>;
+		devices = <&fwconcat0 &fwconcat1>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -135,8 +135,8 @@
 				read-only;
 			};
 
-			concat0: partition@60000 {
-				label = "reserved1";
+			fwconcat0: partition@60000 {
+				label = "fwconcat0";
 				reg = <0x060000 0xf90000>;
 			};
 
@@ -158,8 +158,8 @@
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			concat1: partition@0 {
-				label = "reserved2";
+			fwconcat1: partition@0 {
+				label = "fwconcat1";
 				reg = <0x0 0x1000000>;
 			};
 		};
diff --git a/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts b/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
index 952747ade0..f9801693c5 100644
--- a/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
+++ b/target/linux/ath79/dts/qca9557_engenius_enstationac-v1.dts
@@ -62,7 +62,7 @@
 	virtual_flash {
 		compatible = "mtd-concat";
 
-		devices = <&firmware1 &firmware2>;
+		devices = <&fwconcat0 &fwconcat1>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -118,8 +118,8 @@
 				read-only;
 			};
 
-			firmware2: partition@b0000 {
-				label = "firmware2";
+			fwconcat1: partition@b0000 {
+				label = "fwconcat1";
 				reg = <0x0b0000 0x170000>;
 			};
 
@@ -129,8 +129,8 @@
 				read-only;
 			};
 
-			firmware1: partition@230000 {
-				label = "firmware1";
+			fwconcat0: partition@230000 {
+				label = "fwconcat0";
 				reg = <0x230000 0xb40000>;
 			};
 
diff --git a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
index c88e2b0ba6..af22f6681a 100644
--- a/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
+++ b/target/linux/ath79/dts/qca9558_belkin_f9x-v2.dtsi
@@ -77,7 +77,7 @@
 	virtual_flash {
 		compatible = "mtd-concat";
 
-		devices = <&fwpart1 &fwpart2>;
+		devices = <&fwconcat0 &fwconcat1>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -141,8 +141,8 @@
 				reg = <0x040000 0x010000>;
 			};
 
-			fwpart1: partition@50000 {
-				label = "fwpart1";
+			fwconcat0: partition@50000 {
+				label = "fwconcat0";
 				reg = <0x050000 0xe20000>;
 			};
 
@@ -152,8 +152,8 @@
 				read-only;
 			};
 
-			fwpart2: partition@e80000 {
-				label = "fwpart2";
+			fwconcat1: partition@e80000 {
+				label = "fwconcat1";
 				reg = <0xe80000 0x170000>;
 			};
 
diff --git a/target/linux/ramips/dts/mt7620n_sunvalley_filehub.dtsi b/target/linux/ramips/dts/mt7620n_sunvalley_filehub.dtsi
index d94379a41f..beca2954dc 100644
--- a/target/linux/ramips/dts/mt7620n_sunvalley_filehub.dtsi
+++ b/target/linux/ramips/dts/mt7620n_sunvalley_filehub.dtsi
@@ -23,7 +23,7 @@
 	virtual_flash {
 		compatible = "mtd-concat";
 
-		devices = <&firmware1 &firmware2 &firmware3>;
+		devices = <&fwconcat0 &fwconcat1 &fwconcat2>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -89,8 +89,8 @@
 				read-only;
 			};
 
-			firmware2: partition@60000 {
-				label = "firmware2";
+			fwconcat1: partition@60000 {
+				label = "fwconcat1";
 				reg = <0x60000 0x170000>;
 			};
 
@@ -99,13 +99,13 @@
 				reg = <0x1d0000 0x10000>;
 			};
 
-			firmware3: partition@1e0000 {
-				label = "firmware3";
+			fwconcat2: partition@1e0000 {
+				label = "fwconcat2";
 				reg = <0x1e0000 0x20000>;
 			};
 
-			firmware1: partition@200000 {
-				label = "firmware1";
+			fwconcat0: partition@200000 {
+				label = "fwconcat0";
 				reg = <0x200000 0x600000>;
 			};
 		};
diff --git a/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts b/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts
index 87b103f539..774fb93d9c 100644
--- a/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts
+++ b/target/linux/ramips/dts/mt7621_hiwifi_hc5962.dts
@@ -45,14 +45,14 @@
 
 	ubi-concat {
 		compatible = "mtd-concat";
-		devices = <&ubipart0 &ubipart1>;
+		devices = <&ubiconcat0 &ubiconcat1>;
 
 		partitions {
 			compatible = "fixed-partitions";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			ubi@0 {
+			partition@0 {
 				label = "ubi";
 				reg = <0x0 0x79c0000>;
 			};
@@ -91,8 +91,8 @@
 			reg = <0x140000 0x400000>;
 		};
 
-		ubipart0: partition@540000 {
-			label = "ubipart0";
+		ubiconcat0: partition@540000 {
+			label = "ubiconcat0";
 			reg = <0x540000 0x1c80000>;
 		};
 
@@ -102,8 +102,8 @@
 			read-only;
 		};
 
-		ubipart1: partition@2240000 {
-			label = "ubipart1";
+		ubiconcat1: partition@2240000 {
+			label = "ubiconcat1";
 			reg = <0x2240000 0x5d40000>;
 		};
 	};