commit 9fe288b15f61a6f779e1083c4b3a5ab4278dd953
author Manish V Badarkhe <manish.badarkhe@arm.com> Mon Apr 29 13:32:09 2024 +0200
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Mon Apr 29 13:32:09 2024 +0200
tree 0cb22ee7ad2673882680a2e5392055eda8d9b307
parent dbb7eb3a62bac5cef188b5bcedba18c6b41b3eaa
parent cc52b3aba03970a44016f04d3c5a67f82ba6e268

Merge "fix(tc): remove timer interrupt from G1S" into integration

include/plat/arm/css/common/css_def.h

diff --git a/include/plat/arm/css/common/css_def.h b/include/plat/arm/css/common/css_def.h
index 0aea548..6203937 100644
--- a/include/plat/arm/css/common/css_def.h
+++ b/include/plat/arm/css/common/css_def.h
@@ -58,12 +58,12 @@
 	INTR_PROP_DESC(CSS_IRQ_GPU_SMMU_0, GIC_HIGHEST_SEC_PRIORITY, grp, \
 			GIC_INTR_CFG_LEVEL), \
 	INTR_PROP_DESC(CSS_IRQ_TZC, GIC_HIGHEST_SEC_PRIORITY, grp, \
-			GIC_INTR_CFG_LEVEL), \
-	INTR_PROP_DESC(CSS_IRQ_SEC_SYS_TIMER, GIC_HIGHEST_SEC_PRIORITY, grp, \
 			GIC_INTR_CFG_LEVEL)
 
 #define CSS_G1S_IRQ_PROPS(grp) \
 	CSS_G1S_INT_PROPS(grp), \
+	INTR_PROP_DESC(CSS_IRQ_SEC_SYS_TIMER, GIC_HIGHEST_SEC_PRIORITY, grp, \
+			GIC_INTR_CFG_LEVEL), \
 	INTR_PROP_DESC(CSS_IRQ_TZ_WDOG, GIC_HIGHEST_SEC_PRIORITY, grp, \
 			GIC_INTR_CFG_LEVEL)