From df02aeeec640d2358301e903d9c8c473d455be9e Mon Sep 17 00:00:00 2001 From: Biwen Li Date: Tue, 5 Jan 2021 14:58:57 +0800 Subject: [PATCH] feat(nxp-dcfg): add Chassis 3 support Add support for Chassis 3. Signed-off-by: Biwen Li Signed-off-by: Jiafei Pan Change-Id: I85cf68d4f1db81bf344e34dce13799ae173aa23a --- drivers/nxp/dcfg/dcfg.c | 9 +++------ include/drivers/nxp/dcfg/dcfg.h | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/nxp/dcfg/dcfg.c b/drivers/nxp/dcfg/dcfg.c index a988c5dd0..e5c4db437 100644 --- a/drivers/nxp/dcfg/dcfg.c +++ b/drivers/nxp/dcfg/dcfg.c @@ -1,5 +1,5 @@ /* - * Copyright 2020-2021 NXP + * Copyright 2020-2022 NXP * * SPDX-License-Identifier: BSD-3-Clause * @@ -74,14 +74,11 @@ const devdisr5_info_t *get_devdisr5_info(void) reg = gur_in32(dcfg_init_info->g_nxp_dcfg_addr + DCFG_DEVDISR5_OFFSET); + devdisr5_info.ddrc1_present = (reg & DISR5_DDRC1_MASK) ? 0 : 1; #if defined(CONFIG_CHASSIS_3_2) - devdisr5_info.ddrc1_present = (reg & DISR5_DDRC1_MASK) ? 0 : 1; devdisr5_info.ddrc2_present = (reg & DISR5_DDRC2_MASK) ? 0 : 1; - devdisr5_info.ocram_present = (reg & DISR5_OCRAM_MASK) ? 0 : 1; -#elif defined(CONFIG_CHASSIS_2) - devdisr5_info.ddrc1_present = (reg & DISR5_DDRC1_MASK) ? 0 : 1; - devdisr5_info.ocram_present = (reg & DISR5_OCRAM_MASK) ? 0 : 1; #endif + devdisr5_info.ocram_present = (reg & DISR5_OCRAM_MASK) ? 0 : 1; devdisr5_info.is_populated = true; return (const devdisr5_info_t *) &devdisr5_info; diff --git a/include/drivers/nxp/dcfg/dcfg.h b/include/drivers/nxp/dcfg/dcfg.h index 524450a82..cf29b1201 100644 --- a/include/drivers/nxp/dcfg/dcfg.h +++ b/include/drivers/nxp/dcfg/dcfg.h @@ -1,5 +1,5 @@ /* - * Copyright 2018-2021 NXP + * Copyright 2018-2022 NXP * * SPDX-License-Identifier: BSD-3-Clause * @@ -12,7 +12,7 @@ #if defined(CONFIG_CHASSIS_2) #include -#elif defined(CONFIG_CHASSIS_3_2) +#elif defined(CONFIG_CHASSIS_3_2) || defined(CONFIG_CHASSIS_3) #include #endif