rework SCP DT ID macrosscp-dts-id-rework

Signed-off-by: Mike Leach <mike.leach@linaro.org>

1 files changed, 35 insertions, 13 deletions

diff --git a/framework/include/fwk_dt_config_common.h b/framework/include/fwk_dt_config_common.h
index ef8fcb723d3c..996caf3e8209 100644
--- a/framework/include/fwk_dt_config_common.h
+++ b/framework/include/fwk_dt_config_common.h
@@ -133,7 +133,17 @@
  */
 
 /**
- * @brief Generate SCP element ID from phandle sds_ids reference.
+ * @brief Generate SCP Module ID from phandle scp-ids reference.
+ * @param compat Compatible name
+ * @param inst Instance number
+ * 
+ * Use the Phandle references to the SCP ID compatibles to create Module ID types
+ */
+#define FWK_DT_PH_IDX_SCP_ID_MOD(compat, inst, array_idx) FWK_ID_MODULE_INIT( \
+        DT_PHA_BY_IDX(DT_INST(inst, compat), scp_ids, array_idx, mod_idx))
+
+/**
+ * @brief Generate SCP element ID from phandle scp-ids reference.
  * @param compat Compatible name
  * @param inst Instance number
  * @param array_idx
@@ -152,33 +162,45 @@
 #define FWK_DT_PH_SCP_ID_ELEM(compat, inst) FWK_DT_PH_IDX_SCP_ID_ELEM(compat, inst, 0)
 
 /**
- * @brief Generate SCP API ID from phandle sds_ids reference.
+ * @brief Generate SCP sub-element ID from phandle scp-ids reference.
  * @param compat Compatible name
  * @param inst Instance number
  * @param array_idx
  *
- * Use the Phandle references to the SCP ID compatibles to create API ID types.
+ *  Use the Phandle references to the SCP ID compatibles to create sub-Element ID types.
  */
-#define FWK_DT_PH_IDX_SCP_ID_API(compat, inst, array_idx) FWK_ID_API_INIT( \
+#define FWK_DT_PH_IDX_SCP_ID_SUB_ELEM(compat, inst, array_idx) FWK_ID_SUB_ELEMENT_INIT( \
         DT_PHA_BY_IDX(DT_INST(inst, compat), scp_ids, array_idx, mod_idx), \
-        DT_PHA_BY_IDX(DT_INST(inst, compat), scp_ids, array_idx, elem_idx))
+        DT_PHA_BY_IDX(DT_INST(inst, compat), scp_ids, array_idx, elem_idx), \
+        DT_PHA_BY_IDX(DT_INST(inst, compat), scp_ids, array_idx, sub_elem_idx))
 
 /**
- * @brief Shortcut to get the first SCP API ID in an array
+ * @brief Shortcut to get the first SCP sub element ID in an array
  * @param compat Compatible name
  * @param inst Instance number
  */
-#define FWK_DT_PH_SCP_ID_API(compat, inst) FWK_DT_PH_IDX_SCP_ID_API(compat, inst, 0)
+#define FWK_DT_PH_SCP_ID_SUB_ELEM(compat, inst) FWK_DT_PH_IDX_SCP_ID_SUB_ELEM(compat, inst, 0)
+
 
 /**
- * @brief Generate SCP Module ID from phandle sds_ids reference.
+ * @brief Generate SCP API ID from phandle scp-ids reference.
  * @param compat Compatible name
  * @param inst Instance number
- * 
- * Use the Phandle references to the SCP ID compatibles to create Module ID types
+ * @param array_idx
+ *
+ * Use the Phandle references to the SCP ID compatibles to create API ID types.
  */
-#define FWK_DT_PH_IDX_SCP_ID_MOD(compat, inst, array_idx) FWK_ID_MODULE_INIT( \
-        DT_PHA_BY_IDX(DT_INST(inst, compat), scp_ids, array_idx, mod_idx))
+#define FWK_DT_PH_IDX_SCP_ID_API(compat, inst, array_idx) FWK_ID_API_INIT( \
+        DT_PHA_BY_IDX(DT_INST(inst, compat), scp_ids, array_idx, mod_idx), \
+        DT_PHA_BY_IDX(DT_INST(inst, compat), scp_ids, array_idx, api_idx))
+
+/**
+ * @brief Shortcut to get the first SCP API ID in an array
+ * @param compat Compatible name
+ * @param inst Instance number
+ */
+#define FWK_DT_PH_SCP_ID_API(compat, inst) FWK_DT_PH_IDX_SCP_ID_API(compat, inst, 0)
+
 
 /**
  * @brief Generate SCP Notification ID from phandle sds_ids reference.
@@ -190,7 +212,7 @@
  */
 #define FWK_DT_PH_IDX_SCP_ID_NTFY(compat, inst, array_idx) FWK_ID_NOTIFICATION_INIT( \
         DT_PHA_BY_IDX(DT_INST(inst, compat), scp_ids, array_idx, mod_idx), \
-        DT_PHA_BY_IDX(DT_INST(inst, compat), scp_ids, array_idx, elem_idx))        
+        DT_PHA_BY_IDX(DT_INST(inst, compat), scp_ids, array_idx, ntfy_idx))        
 
 /**
  * @brief Create an Element ID if a phandle present at array index