cmn600: use system info module to retrieve chip information

Commit 7acbd4d8fb4d ("cmn600: expose API to read chip information from
platforms") introduced an api to obtain chip information in the cmn600
module. As the system info module provides a reusable and scalable
interface to obtain system information, rework the cmn600 module to use
the system_info module to obtain the chip id and multi-chip information
and remove the chip info api in cmn600 and its implementation from the
n1sdp system module.

Change-Id: I2cfa45ba9bf4632f73bc021f4779f6bc2c96d93b
Signed-off-by: Vijayenthiran Subramaniam <vijayenthiran.subramaniam@arm.com>

5 files changed, 0 insertions, 30 deletions

diff --git a/product/n1sdp/module/n1sdp_system/include/mod_n1sdp_system.h b/product/n1sdp/module/n1sdp_system/include/mod_n1sdp_system.h
index e9f9bb02..d2276702 100644
--- a/product/n1sdp/module/n1sdp_system/include/mod_n1sdp_system.h
+++ b/product/n1sdp/module/n1sdp_system/include/mod_n1sdp_system.h
@@ -69,9 +69,6 @@ enum mod_n1sdp_system_api_idx {
     /*! API index for AP memory access */
     MOD_N1SDP_SYSTEM_API_IDX_AP_MEMORY_ACCESS,
 
-    /*! API index for getting chip information */
-    MOD_N1SDP_SYSTEM_API_IDX_CHIPINFO,
-
     /*! Number of exposed interfaces */
     MOD_N1SDP_SYSTEM_API_COUNT,
 };
diff --git a/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c b/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c
index ba403f21..6c681daf 100644
--- a/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c
+++ b/product/n1sdp/module/n1sdp_system/src/mod_n1sdp_system.c
@@ -239,23 +239,6 @@ static const struct mod_system_power_driver_api
 };
 
 /*
- * Chip information API
- */
-static int n1sdp_get_chipinfo(uint8_t *chip_id, bool *mc_mode)
-{
-    fwk_assert((chip_id != NULL) && (mc_mode != NULL));
-
-    *chip_id = n1sdp_get_chipid();
-    *mc_mode = n1sdp_is_multichip_enabled();
-
-    return FWK_SUCCESS;
-}
-
-static const struct mod_cmn600_chipinfo_api n1sdp_chipinfo_api = {
-    .get_chipinfo = n1sdp_get_chipinfo,
-};
-
-/*
  * AP memory 1MB windowed access driver API
  */
 
@@ -611,9 +594,6 @@ static int n1sdp_system_process_bind_request(fwk_id_t requester_id,
     case MOD_N1SDP_SYSTEM_API_IDX_AP_MEMORY_ACCESS:
         *api = &n1sdp_system_ap_memory_access_api;
         break;
-    case MOD_N1SDP_SYSTEM_API_IDX_CHIPINFO:
-        *api = &n1sdp_chipinfo_api;
-        break;
     default:
         return FWK_E_PARAM;
     }
diff --git a/product/n1sdp/scp_ramfw/config_cmn600.c b/product/n1sdp/scp_ramfw/config_cmn600.c
index faf0e9b6..ec13271c 100644
--- a/product/n1sdp/scp_ramfw/config_cmn600.c
+++ b/product/n1sdp/scp_ramfw/config_cmn600.c
@@ -176,9 +176,6 @@ const struct fwk_module_config config_cmn600 = {
         .chip_addr_space = UINT64_C(4) * FWK_TIB,
         .clock_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_CLOCK,
             CLOCK_IDX_INTERCONNECT),
-        .chipinfo_api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_N1SDP_SYSTEM,
-            MOD_N1SDP_SYSTEM_API_IDX_CHIPINFO),
-        .chipinfo_mod_id = FWK_ID_MODULE_INIT(FWK_MODULE_IDX_N1SDP_SYSTEM),
         .hnf_cal_mode = false,
     }),
 };
diff --git a/product/rdn1e1/scp_ramfw/config_cmn600.c b/product/rdn1e1/scp_ramfw/config_cmn600.c
index 051061a5..99540b34 100644
--- a/product/rdn1e1/scp_ramfw/config_cmn600.c
+++ b/product/rdn1e1/scp_ramfw/config_cmn600.c
@@ -105,8 +105,6 @@ const struct fwk_module_config config_cmn600 = {
         .chip_addr_space = UINT64_C(4) * FWK_TIB,
         .clock_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_CLOCK,
             CLOCK_IDX_INTERCONNECT),
-        .chipinfo_api_id = FWK_ID_NONE_INIT,
-        .chipinfo_mod_id = FWK_ID_NONE_INIT,
         .hnf_cal_mode = false,
     }),
 };
diff --git a/product/sgi575/scp_ramfw/config_cmn600.c b/product/sgi575/scp_ramfw/config_cmn600.c
index 71052ed0..3df9bf38 100644
--- a/product/sgi575/scp_ramfw/config_cmn600.c
+++ b/product/sgi575/scp_ramfw/config_cmn600.c
@@ -103,8 +103,6 @@ const struct fwk_module_config config_cmn600 = {
         .chip_addr_space = UINT64_C(4) * FWK_TIB,
         .clock_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_CLOCK,
             CLOCK_IDX_INTERCONNECT),
-        .chipinfo_api_id = FWK_ID_NONE_INIT,
-        .chipinfo_mod_id = FWK_ID_NONE_INIT,
         .hnf_cal_mode = false,
     }),
 };