From 1acea54708d77b90dfdea2c6e7ff84b500fc4c5a Mon Sep 17 00:00:00 2001 From: Saahil Tomar Date: Wed, 19 Jul 2023 17:14:23 +0530 Subject: [PATCH] ipq9574: Add support for RDP467 RDP467 is same as AL02-C4 with PCIE0 enabled with wkk support. Change-Id: If6ba645b7c62a3320139a7c86e0b89ec525a0fb7 Signed-off-by: Saahil Tomar Signed-off-by: Hariharan K --- arch/arm/include/asm/mach-types.h | 1 + board/qca/arm/ipq9574/ipq9574.c | 11 +++++++++-- tools/pack.py | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index 43dffe03cf..4dfcc3b7d1 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -1173,6 +1173,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_IPQ9574_AP_AL02_C16 0x8050F01 #define MACH_TYPE_IPQ9574_AP_AL03_C1 0x8050002 #define MACH_TYPE_IPQ9574_AP_AL03_C2 0x8050102 +#define MACH_TYPE_IPQ9574_RDP467 0x8051301 #define MACH_TYPE_IPQ5332_EMULATION 0xF060000 #define MACH_TYPE_IPQ5332_AP_MI01_3 0x8060002 #define MACH_TYPE_IPQ5332_AP_MI01_3_C2 0x8060102 diff --git a/board/qca/arm/ipq9574/ipq9574.c b/board/qca/arm/ipq9574/ipq9574.c index 2f26d6f805..1ef154a34e 100644 --- a/board/qca/arm/ipq9574/ipq9574.c +++ b/board/qca/arm/ipq9574/ipq9574.c @@ -1393,6 +1393,8 @@ unsigned int get_dts_machid(unsigned int machid) return MACH_TYPE_IPQ9574_AP_AL02_C13; case MACH_TYPE_IPQ9574_AP_AL03_C2: return MACH_TYPE_IPQ9574_AP_AL03_C1; + case MACH_TYPE_IPQ9574_RDP467: + return MACH_TYPE_IPQ9574_AP_AL02_C13; default: return machid; } @@ -1419,8 +1421,8 @@ void ipq_uboot_fdt_fixup(void) break; case MACH_TYPE_IPQ9574_AP_AL02_C11: config_list[config_nos++] = "config@al02-c11"; - config_list[config_nos++] = "config@rdp467"; - config_list[config_nos++] = "config-rdp467"; + config_list[config_nos++] = "config@rdp455"; + config_list[config_nos++] = "config-rdp455"; break; case MACH_TYPE_IPQ9574_AP_AL02_C12: config_list[config_nos++] = "config@al02-c12"; @@ -1445,6 +1447,11 @@ void ipq_uboot_fdt_fixup(void) config_list[config_nos++] = "config@rdp458"; config_list[config_nos++] = "config-rdp458"; break; + case MACH_TYPE_IPQ9574_RDP467: + config_list[config_nos++] = "config@rdp467"; + config_list[config_nos++] = "config@rdp467"; + config_list[config_nos++] = "config-rdp467"; + break; } if (config_nos) diff --git a/tools/pack.py b/tools/pack.py index 50418baa22..579a15b846 100644 --- a/tools/pack.py +++ b/tools/pack.py @@ -2095,7 +2095,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" = "8050e01" || test "$machid" = "8050f01" || test "$machid" = "8051001" || test "$machid" = "0x8051101" || test "$machid" = "8051201" || test "$machid" = "8050002" || test "$machid" = "8050102" || test "$machid" = "8050003" || test "$machid" = "8050004"; 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" = "8051001" || test "$machid" = "0x8051101" || test "$machid" = "8051201" || test "$machid" = "8051301" || test "$machid" = "8050002" || test "$machid" = "8050102" || test "$machid" = "8050003" || test "$machid" = "8050004"; 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 @@ -2121,7 +2121,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" = "8050e01" || test "$machid" = "8050f01" || test "$machid" = "8051001" || test "$machid" = "0x8051101" || test "$machid" = "8051201" || test "$machid" = "8050002" || test "$machid" = "8050102" || test "$machid" = "8050003" || test "$machid" = "8050004"; 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" = "8051001" || test "$machid" = "0x8051101" || test "$machid" = "8051201" || test "$machid" = "8051301" || test "$machid" = "8050002" || test "$machid" = "8050102" || test "$machid" = "8050003" || test "$machid" = "8050004"; 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