diff --git a/common/socinfo.c b/common/socinfo.c
index 3a23b5a601b34816eeabab659a89767f052e9ba2..b5182525530a587f2fad83a6786d6cfc9a12d021 100644 (file)
--- a/common/socinfo.c
+++ b/common/socinfo.c
#include <mmio.h>
#include <string.h>
#include <sec_proxy.h>
+#include <soc/am65x/am65x_host_info.h>
+#include <soc/am65x/am65x_sec_proxy_info.h>
+#include <soc/am65x/am65x_processors_info.h>
+#include <soc/j721e/j721e_host_info.h>
+#include <soc/j721e/j721e_sec_proxy_info.h>
+#include <soc/j721e/j721e_processors_info.h>
/* Assuming these addresses and definitions stay common across K3 devices */
#define CTRLMMR_WKUP_JTAG_DEVICE_ID 0x43000018
[REV_PG_MAX] = "NULL"
};
+static void am654_init(void)
+{
+ struct ti_sci_info *sci_info = &soc_info.sci_info;
+
+ sci_info->host_info = am65x_host_info;
+ sci_info->num_hosts = AM65X_MAX_HOST_IDS;
+ sci_info->sp_info[MAIN_SEC_PROXY] = am65x_main_sp_info;
+ sci_info->num_sp_threads[MAIN_SEC_PROXY] = AM65X_MAIN_SEC_PROXY_THREADS;
+ sci_info->sp_info[MCU_SEC_PROXY] = am65x_mcu_sp_info;
+ sci_info->num_sp_threads[MCU_SEC_PROXY] = AM65X_MCU_SEC_PROXY_THREADS;
+ sci_info->processors_info = am65x_processors_info;
+ sci_info->num_processors = AM65X_MAX_PROCESSORS_IDS;
+}
+
+static void j721e_init(void)
+{
+ struct ti_sci_info *sci_info = &soc_info.sci_info;
+
+ sci_info->host_info = j721e_host_info;
+ sci_info->num_hosts = J721E_MAX_HOST_IDS;
+ sci_info->sp_info[MAIN_SEC_PROXY] = j721e_main_sp_info;
+ sci_info->num_sp_threads[MAIN_SEC_PROXY] = J721E_MAIN_SEC_PROXY_THREADS;
+ sci_info->sp_info[MCU_SEC_PROXY] = j721e_mcu_sp_info;
+ sci_info->num_sp_threads[MCU_SEC_PROXY] = J721E_MCU_SEC_PROXY_THREADS;
+ sci_info->processors_info = j721e_processors_info;
+ sci_info->num_processors = J721E_MAX_PROCESSORS_IDS;
+}
+
int soc_init(void)
{
memset(&soc_info, 0, sizeof(soc_info));
soc_info.host_id = DEFAULT_HOST_ID;
+ if (soc_info.soc == AM654)
+ am654_init();
+ else if (soc_info.soc == J721E)
+ j721e_init();
+
/* ToDo: Add error if sec_proxy_init/sci_init is failed */
if(!k3_sec_proxy_init())
if (!ti_sci_init())