From abdedad3118b541fe2f85b5691d7644967975d0a Mon Sep 17 00:00:00 2001 From: Saahil Tomar Date: Tue, 28 Jun 2022 14:52:16 +0530 Subject: [PATCH] arm64: dts: ipq9574: Add AL03-C2 RDP support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This RDP is based on AL03-C1. The extra feature are WK03.2 – 2G+5GL in Pcie 0 & WK01.7 – 5GH+6G in Pcie 2. Change-Id: Ic52c71e98e1a06acf36a825d23f1d184601d153a Signed-off-by: Saahil Tomar --- arch/arm/include/asm/mach-types.h | 2 ++ board/qca/arm/ipq9574/ipq9574.c | 5 +++++ tools/pack.py | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index 06b22b0bd9..1009f2c92c 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -1169,6 +1169,8 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_IPQ9574_AP_AL02_C11 0x8050A01 #define MACH_TYPE_IPQ9574_AP_AL02_C12 0x8050B01 #define MACH_TYPE_IPQ9574_AP_AL02_C14 0x8050D01 +#define MACH_TYPE_IPQ9574_AP_AL03_C1 0x8050002 +#define MACH_TYPE_IPQ9574_AP_AL03_C2 0x8050102 #ifdef CONFIG_ARCH_EBSA110 # ifdef machine_arch_type diff --git a/board/qca/arm/ipq9574/ipq9574.c b/board/qca/arm/ipq9574/ipq9574.c index cf1b315d91..2e327cbfce 100644 --- a/board/qca/arm/ipq9574/ipq9574.c +++ b/board/qca/arm/ipq9574/ipq9574.c @@ -1439,6 +1439,8 @@ unsigned int get_dts_machid(unsigned int machid) return MACH_TYPE_IPQ9574_AP_AL02_C4; case MACH_TYPE_IPQ9574_AP_AL02_C14: return MACH_TYPE_IPQ9574_AP_AL02_C8; + case MACH_TYPE_IPQ9574_AP_AL03_C2: + return MACH_TYPE_IPQ9574_AP_AL03_C1; default: return machid; } @@ -1472,6 +1474,9 @@ void ipq_uboot_fdt_fixup(void) case MACH_TYPE_IPQ9574_AP_AL02_C14: config = "config@al02-c14"; break; + case MACH_TYPE_IPQ9574_AP_AL03_C2: + config = "config@al03-c2"; + break; } if (config != NULL) diff --git a/tools/pack.py b/tools/pack.py index 0a9a208746..6bd48b7823 100644 --- a/tools/pack.py +++ b/tools/pack.py @@ -2076,7 +2076,7 @@ class Pack(object): flinfo.chipsize, blocksize, chipsize, root_part) self.partitions = mibib_qcn9224.get_parts() - script.append('if test "$machid" = "8050301" || test "$machid" = "8050501" || test "$machid" = "8050601" || test "$machid" = "8050701" || test "$machid" = "8050801" || test "$machid" = "8050901" || test "$machid" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01" || test "$machid" = "8050d01" || test "$machid" = "8050002"; then\n', fatal=False) + script.append('if test "$machid" = "8050301" || test "$machid" = "8050501" || test "$machid" = "8050601" || test "$machid" = "8050701" || test "$machid" = "8050801" || test "$machid" = "8050901" || test "$machid" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01" || test "$machid" = "8050d01" || test "$machid" = "8050002" || test "$machid" = "8050102"; then\n', fatal=False) ret = self.__gen_flash_script(script, flinfo, root, True) if ret == 0: return 0 #Issue in packing al+wkk single-image @@ -2102,7 +2102,7 @@ class Pack(object): gpt = GPT(part_fname_qcn9224, flinfo.pagesize, flinfo.blocksize, flinfo.chipsize) self.partitions = gpt.get_parts() - script.append('if test "$machid" = "8050301" || test "$machid" = "8050501" || test "$machid" = "8050601" || test "$machid" = "8050701" || test "$machid" = "8050801" || test "$machid" = "8050901" || test "$machid" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01" || test "$machid" = "8050d01" || test "$machid" = "8050002"; then\n', fatal=False) + script.append('if test "$machid" = "8050301" || test "$machid" = "8050501" || test "$machid" = "8050601" || test "$machid" = "8050701" || test "$machid" = "8050801" || test "$machid" = "8050901" || test "$machid" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01" || test "$machid" = "8050d01" || test "$machid" = "8050002" || test "$machid" = "8050102"; then\n', fatal=False) ret = self.__gen_flash_script(script, flinfo, root, True) if ret == 0: return 0 #Issue in packing al+wkk single-image