misc: Fix `initializer element is not constant` errors

Change-Id: I978ce4e6d7b81a9cbe9313a2e6b855f767294ffd
Signed-off-by: Chris Kay <chris.kay@arm.com>

7 files changed, 28 insertions, 28 deletions

diff --git a/product/sgm775/scp_ramfw/config_css_clock.c b/product/sgm775/scp_ramfw/config_css_clock.c
index aa83f2c3..18d50233 100644
--- a/product/sgm775/scp_ramfw/config_css_clock.c
+++ b/product/sgm775/scp_ramfw/config_css_clock.c
@@ -172,29 +172,29 @@ static const struct mod_css_clock_rate rate_table_vpu[] = {
 };
 
 static const fwk_id_t member_table_cpu_group_big[] = {
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 4),
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 5),
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 6),
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 7),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 4),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 5),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 6),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 7),
 };
 
 static const fwk_id_t member_table_cpu_group_little[] = {
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 0),
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 1),
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 2),
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 3),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 0),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 1),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 2),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 3),
 };
 
 static const fwk_id_t member_table_gpu[] = {
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 8),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 8),
 };
 
 static const fwk_id_t member_table_vpu[] = {
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 9),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 9),
 };
 
 static const fwk_id_t member_table_dpu[] = {
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 11),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 11),
 };
 
 static const struct fwk_element css_clock_element_table[] = {
diff --git a/product/sgm775/scp_ramfw/config_log.c b/product/sgm775/scp_ramfw/config_log.c
index 938ca39b..fa492da5 100644
--- a/product/sgm775/scp_ramfw/config_log.c
+++ b/product/sgm775/scp_ramfw/config_log.c
@@ -46,8 +46,8 @@ struct fwk_module_config config_pl011 = {
  * Log module
  */
 static const struct mod_log_config log_data = {
-    .device_id = FWK_ID_ELEMENT(FWK_MODULE_IDX_PL011, 0),
-    .api_id = FWK_ID_API(FWK_MODULE_IDX_PL011, 0),
+    .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0),
+    .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0),
     .log_groups = MOD_LOG_GROUP_ERROR |
                   MOD_LOG_GROUP_INFO |
                   MOD_LOG_GROUP_WARNING |
diff --git a/product/sgm775/scp_ramfw/config_sensor.c b/product/sgm775/scp_ramfw/config_sensor.c
index 439d3c22..816d5f5f 100644
--- a/product/sgm775/scp_ramfw/config_sensor.c
+++ b/product/sgm775/scp_ramfw/config_sensor.c
@@ -45,8 +45,8 @@ struct fwk_module_config config_reg_sensor = {
  * Sensor module config
  */
 static const struct mod_sensor_dev_config soctemp_config = {
-    .driver_id = FWK_ID_ELEMENT(FWK_MODULE_IDX_REG_SENSOR,
-                                REG_SENSOR_DEV_SOC_TEMP),
+    .driver_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_REG_SENSOR,
+                                     REG_SENSOR_DEV_SOC_TEMP),
     .info = &((struct mod_sensor_info) {
         .type = MOD_SENSOR_TYPE_DEGREES_C,
         .update_interval = 0,
diff --git a/product/sgm775/scp_ramfw/config_timer.c b/product/sgm775/scp_ramfw/config_timer.c
index a4e1c8ea..5221f8ee 100644
--- a/product/sgm775/scp_ramfw/config_timer.c
+++ b/product/sgm775/scp_ramfw/config_timer.c
@@ -48,7 +48,7 @@ struct fwk_module_config config_gtimer = {
  * Timer HAL config
  */
 static const struct mod_timer_dev_config refclk_config = {
-    .id = FWK_ID_ELEMENT(FWK_MODULE_IDX_GTIMER, 0),
+    .id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_GTIMER, 0),
     .timer_irq = TIMREFCLK_IRQ,
 };
 
diff --git a/product/sgm775/scp_romfw/config_css_clock.c b/product/sgm775/scp_romfw/config_css_clock.c
index 763cf874..c47aa583 100644
--- a/product/sgm775/scp_romfw/config_css_clock.c
+++ b/product/sgm775/scp_romfw/config_css_clock.c
@@ -48,21 +48,21 @@ static const struct mod_css_clock_rate rate_table_gpu[] = {
 };
 
 static const fwk_id_t member_table_cpu_group_big[] = {
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 9),
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 10),
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 11),
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 12),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 9),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 10),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 11),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 12),
 };
 
 static const fwk_id_t member_table_cpu_group_little[] = {
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 5),
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 6),
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 7),
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 8),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 5),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 6),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 7),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 8),
 };
 
 static const fwk_id_t member_table_gpu[] = {
-    FWK_ID_ELEMENT(FWK_MODULE_IDX_PIK_CLOCK, 13),
+    FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PIK_CLOCK, 13),
 };
 
 static const struct fwk_element css_clock_element_table[] = {
diff --git a/product/sgm775/scp_romfw/config_log.c b/product/sgm775/scp_romfw/config_log.c
index 9fe5259b..1a2399e9 100644
--- a/product/sgm775/scp_romfw/config_log.c
+++ b/product/sgm775/scp_romfw/config_log.c
@@ -46,8 +46,8 @@ struct fwk_module_config config_pl011 = {
  * Log module
  */
 static const struct mod_log_config log_data = {
-    .device_id = FWK_ID_ELEMENT(FWK_MODULE_IDX_PL011, 0),
-    .api_id = FWK_ID_API(FWK_MODULE_IDX_PL011, 0),
+    .device_id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_PL011, 0),
+    .api_id = FWK_ID_API_INIT(FWK_MODULE_IDX_PL011, 0),
     .log_groups = MOD_LOG_GROUP_ERROR |
                   MOD_LOG_GROUP_INFO |
                   MOD_LOG_GROUP_WARNING |
diff --git a/product/sgm775/scp_romfw/config_timer.c b/product/sgm775/scp_romfw/config_timer.c
index e58bbf1a..c88f1d17 100644
--- a/product/sgm775/scp_romfw/config_timer.c
+++ b/product/sgm775/scp_romfw/config_timer.c
@@ -47,7 +47,7 @@ struct fwk_module_config config_gtimer = {
  * Timer HAL config
  */
 static const struct mod_timer_dev_config refclk_config = {
-    .id = FWK_ID_ELEMENT(FWK_MODULE_IDX_GTIMER, 0),
+    .id = FWK_ID_ELEMENT_INIT(FWK_MODULE_IDX_GTIMER, 0),
 };
 
 static const struct fwk_element timer_dev_table[] = {