From 250dfbf658fab24a3b12d9f101ac24c512ec33d3 Mon Sep 17 00:00:00 2001 From: Saahil Tomar Date: Thu, 7 Jul 2022 17:14:40 +0530 Subject: [PATCH] arm64: dts: ipq9574: Add AL02-C15 & AL02-C16 RDP support These RDP are based on AL02-C6 Change-Id: I58e5096e09aa2e3fc7bc4494ef91c2f158698977 Signed-off-by: Saahil Tomar --- arch/arm/include/asm/mach-types.h | 3 +++ board/qca/arm/ipq9574/ipq9574.c | 10 ++++++++++ tools/pack.py | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index 1009f2c92c..58d2f757e1 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -1168,7 +1168,10 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_IPQ9574_AP_AL02_C10 0x8050901 #define MACH_TYPE_IPQ9574_AP_AL02_C11 0x8050A01 #define MACH_TYPE_IPQ9574_AP_AL02_C12 0x8050B01 +#define MACH_TYPE_IPQ9574_AP_AL02_C13 0x8050C01 #define MACH_TYPE_IPQ9574_AP_AL02_C14 0x8050D01 +#define MACH_TYPE_IPQ9574_AP_AL02_C15 0x8050E01 +#define MACH_TYPE_IPQ9574_AP_AL02_C16 0x8050F01 #define MACH_TYPE_IPQ9574_AP_AL03_C1 0x8050002 #define MACH_TYPE_IPQ9574_AP_AL03_C2 0x8050102 diff --git a/board/qca/arm/ipq9574/ipq9574.c b/board/qca/arm/ipq9574/ipq9574.c index a0c4146776..dcae21a6a7 100644 --- a/board/qca/arm/ipq9574/ipq9574.c +++ b/board/qca/arm/ipq9574/ipq9574.c @@ -1386,6 +1386,10 @@ 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_AL02_C15: + return MACH_TYPE_IPQ9574_AP_AL02_C1; + case MACH_TYPE_IPQ9574_AP_AL02_C16: + return MACH_TYPE_IPQ9574_AP_AL02_C13; case MACH_TYPE_IPQ9574_AP_AL03_C2: return MACH_TYPE_IPQ9574_AP_AL03_C1; default: @@ -1421,6 +1425,12 @@ void ipq_uboot_fdt_fixup(void) case MACH_TYPE_IPQ9574_AP_AL02_C14: config = "config@al02-c14"; break; + case MACH_TYPE_IPQ9574_AP_AL02_C15: + config = "config@al02-c15"; + break; + case MACH_TYPE_IPQ9574_AP_AL02_C16: + config = "config@al02-c16"; + break; case MACH_TYPE_IPQ9574_AP_AL03_C2: config = "config@al03-c2"; break; diff --git a/tools/pack.py b/tools/pack.py index 6bd48b7823..885e731ca2 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" || test "$machid" = "8050102"; 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" = "8050e01" || test "$machid" = "8050f01" || 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" || test "$machid" = "8050102"; 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" = "8050e01" || test "$machid" = "8050f01" || 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