From 9339e8cfbb6576c7dc50d7a70f3c43dbf091ecf4 Mon Sep 17 00:00:00 2001 From: Ram Kumar D Date: Wed, 7 Jun 2023 11:52:46 +0530 Subject: [PATCH] arch: arm: dts: ipq: add support boot linux upstream images Change-Id: I451ceff7b899797168eb0d6d15b4426d102b03de Signed-off-by: Ram Kumar D --- arch/arm/dts/ipq5332-mi01.2-qcn9160-c1.dts | 2 +- arch/arm/dts/ipq5332-mi01.2.dts | 2 +- arch/arm/dts/ipq5332-mi01.3.dts | 2 +- arch/arm/dts/ipq5332-mi01.4.dts | 2 +- arch/arm/dts/ipq5332-mi01.6.dts | 2 +- arch/arm/dts/ipq5332-mi03.1.dts | 2 +- arch/arm/dts/ipq5332-mi04.1.dts | 2 +- arch/arm/dts/ipq9574-al01-c1.dts | 2 +- arch/arm/dts/ipq9574-al02-c1.dts | 2 +- arch/arm/dts/ipq9574-al02-c10.dts | 2 +- arch/arm/dts/ipq9574-al02-c13.dts | 2 +- arch/arm/dts/ipq9574-al02-c17.dts | 2 +- arch/arm/dts/ipq9574-al02-c19.dts | 2 +- arch/arm/dts/ipq9574-al02-c2.dts | 2 +- arch/arm/dts/ipq9574-al02-c3.dts | 2 +- arch/arm/dts/ipq9574-al02-c4.dts | 2 +- arch/arm/dts/ipq9574-al02-c7.dts | 2 +- arch/arm/dts/ipq9574-al02-c8.dts | 2 +- arch/arm/dts/ipq9574-al02-c9.dts | 2 +- board/qca/arm/ipq9574/ipq9574.c | 12 ++++++------ 20 files changed, 25 insertions(+), 25 deletions(-) diff --git a/arch/arm/dts/ipq5332-mi01.2-qcn9160-c1.dts b/arch/arm/dts/ipq5332-mi01.2-qcn9160-c1.dts index c24a33bc73..1a31bcbc68 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@rdp472"; + config_name = "config@mi01.2-qcn9160-c1", "config@rdp472", "config-rdp472"; aliases { /delete-property/pci0; diff --git a/arch/arm/dts/ipq5332-mi01.2.dts b/arch/arm/dts/ipq5332-mi01.2.dts index c5be9ee072..6caa6215f8 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@rdp441"; + config_name = "config@mi01.2", "config@rdp441", "config-rdp441"; aliases { console = "/serial@78AF000"; diff --git a/arch/arm/dts/ipq5332-mi01.3.dts b/arch/arm/dts/ipq5332-mi01.3.dts index a5ef3688aa..349f6ee2c3 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@rdp442"; + config_name = "config@mi01.3", "config@rdp442", "config-rdp442"; aliases { console = "/serial@78AF000"; diff --git a/arch/arm/dts/ipq5332-mi01.4.dts b/arch/arm/dts/ipq5332-mi01.4.dts index 532347bee7..863cd61274 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@rdp444"; + config_name = "config@mi01.4", "config@rdp444", "config-rdp444"; aliases { console = "/serial@78AF000"; diff --git a/arch/arm/dts/ipq5332-mi01.6.dts b/arch/arm/dts/ipq5332-mi01.6.dts index 43aadb579d..9fc90f175d 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@rdp468"; + config_name = "config@mi01.6", "config@rdp468", "config-rdp468"; aliases { console = "/serial@78AF000"; diff --git a/arch/arm/dts/ipq5332-mi03.1.dts b/arch/arm/dts/ipq5332-mi03.1.dts index adad2bf8a0..6d56a6e863 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@rdp447"; + config_name = "config@mi03.1", "config@rdp447", "config-rdp447"; aliases { console = "/serial@78AF000"; diff --git a/arch/arm/dts/ipq5332-mi04.1.dts b/arch/arm/dts/ipq5332-mi04.1.dts index 0056fe6783..23c151c533 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@rdp446"; + config_name = "config@mi04.1", "config@rdp446", "config-rdp446"; aliases { console = "/serial@78AF000"; diff --git a/arch/arm/dts/ipq9574-al01-c1.dts b/arch/arm/dts/ipq9574-al01-c1.dts index b88cf62266..a09c6a28ed 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@rdp417"; + config_name = "config@al01-c1", "config@rdp417", "config-rdp417"; aliases { console = "/serial@78B1000"; diff --git a/arch/arm/dts/ipq9574-al02-c1.dts b/arch/arm/dts/ipq9574-al02-c1.dts index 5d2f8de610..1f6f9491d0 100644 --- a/arch/arm/dts/ipq9574-al02-c1.dts +++ b/arch/arm/dts/ipq9574-al02-c1.dts @@ -17,7 +17,7 @@ #include "ipq9574-soc.dtsi" / { machid = <0x8050001>; - config_name = "config@al02-c1", "config@rdp418"; + config_name = "config@al02-c1", "config@rdp418", "config-rdp418"; aliases { console = "/serial@78B1000"; diff --git a/arch/arm/dts/ipq9574-al02-c10.dts b/arch/arm/dts/ipq9574-al02-c10.dts index ee7667bfdc..5b1cbff5b5 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@rdp433-mht"; + config_name = "config@al02-c10", "config@rdp433-mht", "config-rdp433-mht"; 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 b2aa6a18d8..1a71680ccb 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@459"; + config_name = "config@al02-c13", "config@rdp459", "config-rdp459"; aliases { pci0 = "/pci@28000000"; diff --git a/arch/arm/dts/ipq9574-al02-c17.dts b/arch/arm/dts/ipq9574-al02-c17.dts index 76ea7e46b3..d0b20e6d1d 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@469"; + config_name = "config@al02-c17", "config@rdp469", "config-rdp469"; aliases { console = "/serial@78B1000"; diff --git a/arch/arm/dts/ipq9574-al02-c19.dts b/arch/arm/dts/ipq9574-al02-c19.dts index 43fb480ff1..c57d9c58a5 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@rdp461"; + config_name = "config@al02-c19", "config@rdp461", "config-rdp461"; aliases { console = "/serial@78B1000"; diff --git a/arch/arm/dts/ipq9574-al02-c2.dts b/arch/arm/dts/ipq9574-al02-c2.dts index 3ac40c2817..6c15669e74 100644 --- a/arch/arm/dts/ipq9574-al02-c2.dts +++ b/arch/arm/dts/ipq9574-al02-c2.dts @@ -17,7 +17,7 @@ #include "ipq9574-al02-c1.dts" / { machid = <0x8050101>; - config_name = "config@al02-c2", "config@rdp418-emmc"; + config_name = "config@al02-c2", "config@rdp418-emmc", "config-rdp418-emmc"; aliases { mmc = "/sdhci@7804000"; diff --git a/arch/arm/dts/ipq9574-al02-c3.dts b/arch/arm/dts/ipq9574-al02-c3.dts index 036e39728a..eccd715089 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@rdp437"; + config_name = "config@al02-c3", "config@rdp437", "config-rdp437"; aliases { pci0 = "/pci@28000000"; diff --git a/arch/arm/dts/ipq9574-al02-c4.dts b/arch/arm/dts/ipq9574-al02-c4.dts index 3f7ec74177..5434edc478 100644 --- a/arch/arm/dts/ipq9574-al02-c4.dts +++ b/arch/arm/dts/ipq9574-al02-c4.dts @@ -17,7 +17,7 @@ #include "ipq9574-al02-c1.dts" / { machid = <0x8050301>; - config_name = "config@al02-c4","config@rdp433"; + config_name = "config@al02-c4","config@rdp433", "config-rdp433"; aliases { pci1 = "/pci@10000000"; diff --git a/arch/arm/dts/ipq9574-al02-c7.dts b/arch/arm/dts/ipq9574-al02-c7.dts index b41537d9c3..3216db0440 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@rdp433-emmc-mht"; + config_name = "config@al02-c7", "config@rdp433-emmc-mht", "config-rdp433-emmc-mht"; aliases { mmc = "/sdhci@7804000"; diff --git a/arch/arm/dts/ipq9574-al02-c8.dts b/arch/arm/dts/ipq9574-al02-c8.dts index 9e7f4a9751..9a741730c7 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@rdp453"; + config_name = "config@al02-c8", "config@rdp453", "config-rdp453"; 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 2dd2bfa440..54a1ad7d13 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@454"; + config_name = "config@al02-c9", "config@rdp454", "config-rdp454"; aliases { pci0 = "/pci@28000000"; diff --git a/board/qca/arm/ipq9574/ipq9574.c b/board/qca/arm/ipq9574/ipq9574.c index 9cfd3c727b..610973c9ea 100644 --- a/board/qca/arm/ipq9574/ipq9574.c +++ b/board/qca/arm/ipq9574/ipq9574.c @@ -1411,25 +1411,25 @@ void ipq_uboot_fdt_fixup(void) config = "config@al02-c5"; break; case MACH_TYPE_IPQ9574_AP_AL02_C6: - config = "config@al02-c6", "config@rdp449"; + config = "config@al02-c6", "config@rdp449", "config-rdp449"; break; case MACH_TYPE_IPQ9574_AP_AL02_C11: - config = "config@al02-c11", "config@rdp467"; + config = "config@al02-c11", "config@rdp467", "config-rdp467"; break; case MACH_TYPE_IPQ9574_AP_AL02_C12: - config = "config@al02-c12", "config@rdp455"; + config = "config@al02-c12", "config@rdp455", "config-rdp455"; break; case MACH_TYPE_IPQ9574_AP_AL02_C14: config = "config@al02-c14"; break; case MACH_TYPE_IPQ9574_AP_AL02_C15: - config = "config@al02-c15", "config@rdp457"; + config = "config@al02-c15", "config@rdp457", "config-rdp457"; break; case MACH_TYPE_IPQ9574_AP_AL02_C16: - config = "config@al02-c16", "config@rdp456"; + config = "config@al02-c16", "config@rdp456", "config-rdp456"; break; case MACH_TYPE_IPQ9574_AP_AL03_C2: - config = "config@al03-c2", "config@rdp458"; + config = "config@al03-c2", "config@rdp458", "config-rdp458"; break; }