From ccdbe416f511adb2858290712bf3468d4e00bb0b Mon Sep 17 00:00:00 2001 From: Saahil Tomar Date: Thu, 23 Jun 2022 16:31:47 +0530 Subject: [PATCH] arm64: dts: ipq9574: Add AL02-C14 RDP support This RDP is based on AL02-C8 Change-Id: Ia7a7d128562c888bc7a0dcc6afffa36aef17d826 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 e435235595..06b22b0bd9 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -1163,10 +1163,12 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_IPQ9574_AP_AL02_C4 0x8050301 #define MACH_TYPE_IPQ9574_AP_AL02_C5 0x8050401 #define MACH_TYPE_IPQ9574_AP_AL02_C6 0x8050501 +#define MACH_TYPE_IPQ9574_AP_AL02_C8 0x8050701 #define MACH_TYPE_IPQ9574_AP_AL02_C9 0x8050801 #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_C14 0x8050D01 #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 3980dd0be4..cf1b315d91 100644 --- a/board/qca/arm/ipq9574/ipq9574.c +++ b/board/qca/arm/ipq9574/ipq9574.c @@ -1437,6 +1437,8 @@ unsigned int get_dts_machid(unsigned int machid) return MACH_TYPE_IPQ9574_AP_AL02_C4; case MACH_TYPE_IPQ9574_AP_AL02_C12: return MACH_TYPE_IPQ9574_AP_AL02_C4; + case MACH_TYPE_IPQ9574_AP_AL02_C14: + return MACH_TYPE_IPQ9574_AP_AL02_C8; default: return machid; } @@ -1467,6 +1469,9 @@ void ipq_uboot_fdt_fixup(void) case MACH_TYPE_IPQ9574_AP_AL02_C12: config = "config@al02-c12"; break; + case MACH_TYPE_IPQ9574_AP_AL02_C14: + config = "config@al02-c14"; + break; } if (config != NULL) diff --git a/tools/pack.py b/tools/pack.py index c6b016f3dd..60caa5b8a1 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" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01"; then\n', fatal=False) + script.append('if test "$machid" = "8050301" || test "$machid" = "8050501" || test "$machid" = "8050601" || test "$machid" = "8050701" || test "$machid" = "8050801" || test "$machid" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01" || test "$machid" = "8050d01"; 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" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01"; then\n', fatal=False) + script.append('if test "$machid" = "8050301" || test "$machid" = "8050501" || test "$machid" = "8050601" || test "$machid" = "8050701" || test "$machid" = "8050801" || test "$machid" = "8050a01" || test "$machid" = "8050b01" || test "$machid" = "8050c01" || test "$machid" = "8050d01"; 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