common: socinfo: Fix nomenclature on Silicon Revisions

[k3conf/k3conf.git] / common / socinfo.c

diff --git a/common/socinfo.c b/common/socinfo.c
index 96495acfc39e3a96545d3e70a179a33c95db2568..f975bc529d47b21b163eff98c05ab394bce601c3 100644 (file)
--- a/common/socinfo.c
+++ b/common/socinfo.c
@@ -46,6 +46,7 @@
 #include <soc/j721e/j721e_sec_proxy_info.h>
 #include <soc/j721e/j721e_processors_info.h>
 #include <soc/j721e/j721e_devices_info.h>
 #include <soc/j721e/j721e_sec_proxy_info.h>
 #include <soc/j721e/j721e_processors_info.h>
 #include <soc/j721e/j721e_devices_info.h>

+#include <soc/j721e/j721e_clocks_info.h>

 
 /* Assuming these addresses and definitions stay common across K3 devices */
 #define CTRLMMR_WKUP_JTAG_DEVICE_ID    0x43000018
 
 /* Assuming these addresses and definitions stay common across K3 devices */
 #define CTRLMMR_WKUP_JTAG_DEVICE_ID    0x43000018


@@ -117,9 +118,11 @@ static void j721e_init(void)
        sci_info->num_processors = J721E_MAX_PROCESSORS_IDS;
        sci_info->devices_info = j721e_devices_info;
        sci_info->num_devices = J721E_MAX_DEVICES;
        sci_info->num_processors = J721E_MAX_PROCESSORS_IDS;
        sci_info->devices_info = j721e_devices_info;
        sci_info->num_devices = J721E_MAX_DEVICES;

+       sci_info->clocks_info = j721e_clocks_info;
+       sci_info->num_clocks = J721E_MAX_CLOCKS;

 }
 
 }
 

-int soc_init(void)
+int soc_init(uint32_t host_id)

 {
        memset(&soc_info, 0, sizeof(soc_info));
 
 {
        memset(&soc_info, 0, sizeof(soc_info));
 


@@ -140,10 +143,10 @@ int soc_init(void)
 
        strncpy(soc_info.soc_full_name, "", sizeof(soc_info.soc_full_name));
        strcat(soc_info.soc_full_name, soc_name[soc_info.soc]);
 
        strncpy(soc_info.soc_full_name, "", sizeof(soc_info.soc_full_name));
        strcat(soc_info.soc_full_name, soc_name[soc_info.soc]);

-       strcat(soc_info.soc_full_name, " PG");
+       strcat(soc_info.soc_full_name, " SR");

        strcat(soc_info.soc_full_name, soc_revision[soc_info.rev]);
 
        strcat(soc_info.soc_full_name, soc_revision[soc_info.rev]);
 

-       soc_info.host_id = DEFAULT_HOST_ID;
+       soc_info.host_id = host_id;

 
        if (soc_info.soc == AM654)
                am654_init();
 
        if (soc_info.soc == AM654)
                am654_init();