From 0557734dc059e592da41846f2a927320dd83eedf Mon Sep 17 00:00:00 2001 From: Aditya Angadi Date: Thu, 28 Jan 2021 12:15:16 +0530 Subject: [PATCH] plat/arm/css: rename rd_n1e1_edge_scmi_plat_info array Rename rd_n1e1_edge_scmi_plat_info array to plat_rd_scmi_info as the same array is used to provide SCMI platform info across mulitple RD platforms and is not resitricted to only RD-N1 and RD-E1 platforms. Signed-off-by: Aditya Angadi Change-Id: I42ba33e0afa3003c731ce513c6a5754b602ec01f --- plat/arm/css/sgi/sgi_bl31_setup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plat/arm/css/sgi/sgi_bl31_setup.c b/plat/arm/css/sgi/sgi_bl31_setup.c index 36c3fbb6c..e8238ba7c 100644 --- a/plat/arm/css/sgi/sgi_bl31_setup.c +++ b/plat/arm/css/sgi/sgi_bl31_setup.c @@ -28,7 +28,7 @@ static scmi_channel_plat_info_t sgi575_scmi_plat_info = { .ring_doorbell = &mhu_ring_doorbell, }; -static scmi_channel_plat_info_t rd_n1e1_edge_scmi_plat_info[] = { +static scmi_channel_plat_info_t plat_rd_scmi_info[] = { { .scmi_mbx_mem = CSS_SCMI_PAYLOAD_BASE, .db_reg_addr = PLAT_CSS_MHU_BASE + SENDER_REG_SET(0), @@ -76,9 +76,9 @@ scmi_channel_plat_info_t *plat_css_get_scmi_info(int channel_id) if (sgi_plat_info.platform_id == RD_N1E1_EDGE_SID_VER_PART_NUM || sgi_plat_info.platform_id == RD_V1_SID_VER_PART_NUM || sgi_plat_info.platform_id == RD_N2_SID_VER_PART_NUM) { - if (channel_id >= ARRAY_SIZE(rd_n1e1_edge_scmi_plat_info)) + if (channel_id >= ARRAY_SIZE(plat_rd_scmi_info)) panic(); - return &rd_n1e1_edge_scmi_plat_info[channel_id]; + return &plat_rd_scmi_info[channel_id]; } else if (sgi_plat_info.platform_id == SGI575_SSC_VER_PART_NUM) return &sgi575_scmi_plat_info;