From 48648c0993288b51efd3157f03315152ffaae251 Mon Sep 17 00:00:00 2001 From: Yann Gautier Date: Thu, 20 May 2021 11:40:13 +0200 Subject: [PATCH] refactor(plat/mediatek): use SOC_ID defines Use the macros that are now defined in include/lib/smccc.h. Signed-off-by: Yann Gautier Change-Id: Ie1dbc54569086f6a74206b873fee664b4cdeea36 --- plat/mediatek/common/mtk_plat_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plat/mediatek/common/mtk_plat_common.c b/plat/mediatek/common/mtk_plat_common.c index f57e4357d..142b5c999 100644 --- a/plat/mediatek/common/mtk_plat_common.c +++ b/plat/mediatek/common/mtk_plat_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2021, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -139,9 +139,9 @@ int32_t plat_is_smccc_feature_available(u_register_t fid) int32_t plat_get_soc_version(void) { - uint32_t manfid = (JEDEC_MTK_BKID << 24U) | (JEDEC_MTK_MFID << 16U); + uint32_t manfid = SOC_ID_SET_JEP_106(JEDEC_MTK_BKID, JEDEC_MTK_MFID); - return (int32_t)(manfid | (SOC_CHIP_ID & 0xFFFFU)); + return (int32_t)(manfid | (SOC_CHIP_ID & SOC_ID_IMPL_DEF_MASK)); } int32_t plat_get_soc_revision(void)