diff --git a/arch/arm/dts/ipq5332-mi01.2-qcn9160-c1.dts b/arch/arm/dts/ipq5332-mi01.2-qcn9160-c1.dts
index 2b54145376..ec99f91463 100644
--- a/arch/arm/dts/ipq5332-mi01.2-qcn9160-c1.dts
+++ b/arch/arm/dts/ipq5332-mi01.2-qcn9160-c1.dts
@@ -17,7 +17,7 @@
 #include "ipq5332-mi01.2.dts"
 / {
 	machid = <0x8060101>;
-	config_name = "config@mi01.2-qcn9160-c1";
+	config_name = "config@mi01.2-qcn9160-c1", "config-mi01.2-qcn9160-c1";
 
 	aliases {
 		/delete-property/pci0;
diff --git a/arch/arm/dts/ipq5332-mi01.2.dts b/arch/arm/dts/ipq5332-mi01.2.dts
index 21dfc78fd1..af84df1786 100644
--- a/arch/arm/dts/ipq5332-mi01.2.dts
+++ b/arch/arm/dts/ipq5332-mi01.2.dts
@@ -17,7 +17,7 @@
 #include "ipq5332-soc.dtsi"
 / {
 	machid = <0x8060001>;
-	config_name = "config@mi01.2";
+	config_name = "config@mi01.2", "config-mi01.2";
 
 	aliases {
 		console = "/serial@78AF000";
diff --git a/arch/arm/dts/ipq5332-mi01.3.dts b/arch/arm/dts/ipq5332-mi01.3.dts
index 4d59e9162a..a451373875 100644
--- a/arch/arm/dts/ipq5332-mi01.3.dts
+++ b/arch/arm/dts/ipq5332-mi01.3.dts
@@ -17,7 +17,7 @@
 #include "ipq5332-soc.dtsi"
 / {
 	machid = <0x8060002>;
-	config_name = "config@mi01.3";
+	config_name = "config@mi01.3", "config-mi01.3";
 
 	aliases {
 		console = "/serial@78AF000";
diff --git a/arch/arm/dts/ipq5332-mi01.4.dts b/arch/arm/dts/ipq5332-mi01.4.dts
index eb7c3ca2ba..eb0e5f5d70 100644
--- a/arch/arm/dts/ipq5332-mi01.4.dts
+++ b/arch/arm/dts/ipq5332-mi01.4.dts
@@ -17,7 +17,7 @@
 #include "ipq5332-soc.dtsi"
 / {
 	machid = <0x8060003>;
-	config_name = "config@mi01.4";
+	config_name = "config@mi01.4", "config-mi01.4";
 
 	aliases {
 		console = "/serial@78AF000";
diff --git a/arch/arm/dts/ipq5332-mi01.6.dts b/arch/arm/dts/ipq5332-mi01.6.dts
index d522a6833d..6e8fe1f074 100644
--- a/arch/arm/dts/ipq5332-mi01.6.dts
+++ b/arch/arm/dts/ipq5332-mi01.6.dts
@@ -17,7 +17,7 @@
 #include "ipq5332-soc.dtsi"
 / {
 	machid = <0x8060000>;
-	config_name = "config@mi01.6";
+	config_name = "config@mi01.6", "config-mi01.6";
 
 	aliases {
 		console = "/serial@78AF000";
diff --git a/arch/arm/dts/ipq5332-mi01.9.dts b/arch/arm/dts/ipq5332-mi01.9.dts
index d8a03878a9..fc3415b431 100644
--- a/arch/arm/dts/ipq5332-mi01.9.dts
+++ b/arch/arm/dts/ipq5332-mi01.9.dts
@@ -17,7 +17,7 @@
 #include "ipq5332-soc.dtsi"
 / {
 	machid = <0x8060006>;
-	config_name = "config@mi01.9";
+	config_name = "config@mi01.9", "config-mi01.9";
 
 	aliases {
 		console = "/serial@78AF000";
diff --git a/arch/arm/dts/ipq5332-mi03.1.dts b/arch/arm/dts/ipq5332-mi03.1.dts
index f815f43a71..c9e57ee979 100644
--- a/arch/arm/dts/ipq5332-mi03.1.dts
+++ b/arch/arm/dts/ipq5332-mi03.1.dts
@@ -17,7 +17,7 @@
 #include "ipq5332-soc.dtsi"
 / {
 	machid = <0x8060005>;
-	config_name = "config@mi03.1";
+	config_name = "config@mi03.1", "config-mi03.1";
 
 	aliases {
 		console = "/serial@78AF000";
diff --git a/arch/arm/dts/ipq5332-mi04.1.dts b/arch/arm/dts/ipq5332-mi04.1.dts
index 627b813025..8685084a03 100644
--- a/arch/arm/dts/ipq5332-mi04.1.dts
+++ b/arch/arm/dts/ipq5332-mi04.1.dts
@@ -17,7 +17,7 @@
 #include "ipq5332-soc.dtsi"
 / {
 	machid = <0x8060004>;
-	config_name = "config@mi04.1";
+	config_name = "config@mi04.1", "config-mi04.1";
 
 	aliases {
 		console = "/serial@78AF000";
diff --git a/arch/arm/dts/ipq9574-al01-c1.dts b/arch/arm/dts/ipq9574-al01-c1.dts
index 1dc29ab78b..e8ce6066f9 100644
--- a/arch/arm/dts/ipq9574-al01-c1.dts
+++ b/arch/arm/dts/ipq9574-al01-c1.dts
@@ -15,7 +15,7 @@
 #include "ipq9574-soc.dtsi"
 / {
 	machid = <0x8050000>;
-	config_name = "config@al01-c1";
+	config_name = "config@al01-c1", "config-al01-c1";
 
 	aliases {
 		console = "/serial@78B1000";
diff --git a/arch/arm/dts/ipq9574-al02-c1.dts b/arch/arm/dts/ipq9574-al02-c1.dts
index ac06adf9b0..f36d51a485 100644
--- a/arch/arm/dts/ipq9574-al02-c1.dts
+++ b/arch/arm/dts/ipq9574-al02-c1.dts
@@ -15,7 +15,7 @@
 #include "ipq9574-soc.dtsi"
 / {
 	machid = <0x8050001>;
-	config_name = "config@al02-c1";
+	config_name = "config@al02-c1", "config-al02-c1";
 
 	aliases {
 		console = "/serial@78B1000";
diff --git a/arch/arm/dts/ipq9574-al02-c10.dts b/arch/arm/dts/ipq9574-al02-c10.dts
index ec28b34915..5bcafe9b05 100644
--- a/arch/arm/dts/ipq9574-al02-c10.dts
+++ b/arch/arm/dts/ipq9574-al02-c10.dts
@@ -16,7 +16,7 @@
 #include "ipq9574-al02-c8.dts"
 / {
 	machid = <0x8050901>;
-	config_name = "config@al02-c10";
+	config_name = "config@al02-c10", "config-al02-c10";
 
 	ess-switch {
 		/* Overriding config to support QCA8084 Switch instead of
diff --git a/arch/arm/dts/ipq9574-al02-c13.dts b/arch/arm/dts/ipq9574-al02-c13.dts
index d8804e1bb3..06beb90f9c 100644
--- a/arch/arm/dts/ipq9574-al02-c13.dts
+++ b/arch/arm/dts/ipq9574-al02-c13.dts
@@ -16,7 +16,7 @@
 #include "ipq9574-al02-c4.dts"
 / {
 	machid = <0x8050C01>;
-	config_name = "config@al02-c13";
+	config_name = "config@al02-c13", "config-al02-c13";
 
 	aliases {
 		pci0 = "/pci@28000000";
diff --git a/arch/arm/dts/ipq9574-al02-c17.dts b/arch/arm/dts/ipq9574-al02-c17.dts
index 381acacb2d..e477951b79 100644
--- a/arch/arm/dts/ipq9574-al02-c17.dts
+++ b/arch/arm/dts/ipq9574-al02-c17.dts
@@ -16,7 +16,7 @@
 #include "ipq9574-soc.dtsi"
 / {
 	machid = <0x8051001>;
-	config_name = "config@al02-c17";
+	config_name = "config@al02-c17", "config-al02-c17";
 
 	aliases {
 		console = "/serial@78B1000";
diff --git a/arch/arm/dts/ipq9574-al02-c18.dts b/arch/arm/dts/ipq9574-al02-c18.dts
index 5751c36c7d..9b360c5cf0 100644
--- a/arch/arm/dts/ipq9574-al02-c18.dts
+++ b/arch/arm/dts/ipq9574-al02-c18.dts
@@ -15,7 +15,7 @@
 #include "ipq9574-al02-c4.dts"
 / {
 	machid = <0x8051101>;
-	config_name = "config@al02-c18";
+	config_name = "config@al02-c18", "config-al02-c18";
 
 	ess-switch {
 		switch_mac_mode0 = <PORT_WRAPPER_10GBASE_R>;
diff --git a/arch/arm/dts/ipq9574-al02-c19.dts b/arch/arm/dts/ipq9574-al02-c19.dts
index b3fc46f49a..d4cd9845ec 100644
--- a/arch/arm/dts/ipq9574-al02-c19.dts
+++ b/arch/arm/dts/ipq9574-al02-c19.dts
@@ -16,7 +16,7 @@
 #include "ipq9574-soc.dtsi"
 / {
 	machid = <0x8051201>;
-	config_name = "config@al02-c19";
+	config_name = "config@al02-c19", "config-al02-c19";
 
 	aliases {
 		console = "/serial@78B1000";
diff --git a/arch/arm/dts/ipq9574-al02-c2.dts b/arch/arm/dts/ipq9574-al02-c2.dts
index c44b0e71ad..1ae746eac7 100644
--- a/arch/arm/dts/ipq9574-al02-c2.dts
+++ b/arch/arm/dts/ipq9574-al02-c2.dts
@@ -15,7 +15,7 @@
 #include "ipq9574-al02-c1.dts"
 / {
 	machid = <0x8050101>;
-	config_name = "config@al02-c2";
+	config_name = "config@al02-c2", "config-al02-c2";
 
 	aliases {
 		mmc = "/sdhci@7804000";
diff --git a/arch/arm/dts/ipq9574-al02-c3.dts b/arch/arm/dts/ipq9574-al02-c3.dts
index 7cbf4b89c7..d005a17c0b 100644
--- a/arch/arm/dts/ipq9574-al02-c3.dts
+++ b/arch/arm/dts/ipq9574-al02-c3.dts
@@ -16,7 +16,7 @@
 #include "ipq9574-al02-c2.dts"
 / {
 	machid = <0x8050201>;
-	config_name = "config@al02-c3";
+	config_name = "config@al02-c3", "config-al02-c3";
 
 	aliases {
 		pci0 = "/pci@28000000";
diff --git a/arch/arm/dts/ipq9574-al02-c4.dts b/arch/arm/dts/ipq9574-al02-c4.dts
index deac7ee7e7..752ef3993b 100644
--- a/arch/arm/dts/ipq9574-al02-c4.dts
+++ b/arch/arm/dts/ipq9574-al02-c4.dts
@@ -16,7 +16,7 @@
 #include "ipq9574-al02-c1.dts"
 / {
 	machid = <0x8050301>;
-	config_name = "config@al02-c4";
+	config_name = "config@al02-c4", "config-al02-c4";
 
 	aliases {
 		pci1 = "/pci@10000000";
diff --git a/arch/arm/dts/ipq9574-al02-c7.dts b/arch/arm/dts/ipq9574-al02-c7.dts
index f3b7776096..58efd95a4c 100644
--- a/arch/arm/dts/ipq9574-al02-c7.dts
+++ b/arch/arm/dts/ipq9574-al02-c7.dts
@@ -16,7 +16,7 @@
 #include "ipq9574-al02-c4.dts"
 / {
 	machid = <0x8050601>;
-	config_name = "config@al02-c7";
+	config_name = "config@al02-c7", "config-al02-c7";
 
 	aliases {
 		mmc = "/sdhci@7804000";
diff --git a/arch/arm/dts/ipq9574-al02-c8.dts b/arch/arm/dts/ipq9574-al02-c8.dts
index 21a0cc507a..66ecaf5d90 100644
--- a/arch/arm/dts/ipq9574-al02-c8.dts
+++ b/arch/arm/dts/ipq9574-al02-c8.dts
@@ -16,7 +16,7 @@
 #include "ipq9574-al02-c4.dts"
 / {
 	machid = <0x8050701>;
-	config_name = "config@al02-c8";
+	config_name = "config@al02-c8", "config-al02-c8";
 
 	ess-switch {
 		/* Overriding config to support QCA8084 PHY instead of
diff --git a/arch/arm/dts/ipq9574-al02-c9.dts b/arch/arm/dts/ipq9574-al02-c9.dts
index f5497ac327..c32e894721 100644
--- a/arch/arm/dts/ipq9574-al02-c9.dts
+++ b/arch/arm/dts/ipq9574-al02-c9.dts
@@ -16,7 +16,7 @@
 #include "ipq9574-al01-c1.dts"
 / {
 	machid = <0x8050801>;
-	config_name = "config@al02-c9";
+	config_name = "config@al02-c9", "config-al02-c9";
 
 	aliases {
 		pci0 = "/pci@28000000";
diff --git a/arch/arm/dts/ipq9574-al03-c1.dts b/arch/arm/dts/ipq9574-al03-c1.dts
index 8a1f5ade9a..c6a4000c74 100644
--- a/arch/arm/dts/ipq9574-al03-c1.dts
+++ b/arch/arm/dts/ipq9574-al03-c1.dts
@@ -16,7 +16,7 @@
 #include "ipq9574-al01-c1.dts"
 / {
 	machid = <0x8050002>;
-	config_name = "config@al03-c1";
+	config_name = "config@al03-c1", "config-al03-c1";
 
 	aliases {
 		pci0 = "/pci@28000000";
diff --git a/arch/arm/dts/ipq9574-al05.dts b/arch/arm/dts/ipq9574-al05.dts
index 2aa1d64171..d956185766 100644
--- a/arch/arm/dts/ipq9574-al05.dts
+++ b/arch/arm/dts/ipq9574-al05.dts
@@ -16,5 +16,5 @@
 #include "ipq9574-al02-c4.dts"
 / {
 	machid = <0x8050003>;
-	config_name = "config@al05";
+	config_name = "config@al05", "config-al05";
 };
diff --git a/arch/arm/dts/ipq9574-al06.dts b/arch/arm/dts/ipq9574-al06.dts
index 0084f75694..de97dccb41 100644
--- a/arch/arm/dts/ipq9574-al06.dts
+++ b/arch/arm/dts/ipq9574-al06.dts
@@ -16,7 +16,7 @@
 #include "ipq9574-al02-c4.dts"
 / {
 	machid = <0x8050004>;
-	config_name = "config@al06";
+	config_name = "config@al06", "config-al06";
 
 	ess-switch {
 		/* Overriding config to support QCA8084 PHY instead of