From 39bc05eace5da478d9253b82dbe4a292d61a293c Mon Sep 17 00:00:00 2001 From: Hariharan K Date: Tue, 19 Sep 2023 13:06:14 +0530 Subject: [PATCH] ipq9574: Add support for AL02-C20 Changing RDP467 to AL02-C20. Also updating the return machid type for AL02-C11 similar to AL02-C12, since AL02-C11 is converted to RDP455 configuration. Change-Id: I87e3b954d1ea9f38b24504f5b5754f9fef38df83 Signed-off-by: Hariharan K --- arch/arm/include/asm/mach-types.h | 2 +- board/qca/arm/ipq9574/ipq9574.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index d32969ddba..33df12fe03 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -1171,9 +1171,9 @@ extern unsigned int __machine_arch_type; #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_AL02_C20 0x8051301 #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 509b92b720..6552875790 100644 --- a/board/qca/arm/ipq9574/ipq9574.c +++ b/board/qca/arm/ipq9574/ipq9574.c @@ -1382,7 +1382,7 @@ unsigned int get_dts_machid(unsigned int machid) case MACH_TYPE_IPQ9574_AP_AL02_C6: return MACH_TYPE_IPQ9574_AP_AL02_C1; case MACH_TYPE_IPQ9574_AP_AL02_C11: - return MACH_TYPE_IPQ9574_AP_AL02_C13; + 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: @@ -1391,10 +1391,10 @@ unsigned int get_dts_machid(unsigned int machid) 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_AL02_C20: + 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; } @@ -1442,16 +1442,16 @@ void ipq_uboot_fdt_fixup(void) config_list[config_nos++] = "config@rdp456"; config_list[config_nos++] = "config-rdp456"; break; + case MACH_TYPE_IPQ9574_AP_AL02_C20: + config_list[config_nos++] = "config@al02-c20"; + config_list[config_nos++] = "config@rdp467"; + config_list[config_nos++] = "config-rdp467"; + break; case MACH_TYPE_IPQ9574_AP_AL03_C2: config_list[config_nos++] = "config@al03-c2"; 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)