MA-20184 imx8m: update csu config

Update the csu config for imx8m. Change-Id: Iec3aba43fc765e457fa4f2c4a54a9c18c2565749 Signed-off-by: Ji Luo <ji.luo@nxp.com>
nxp-imx · Mar 21, 2023 · 0c52279 · 0c52279
1 parent edaec1f
commit 0c52279
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 1 deletion.
diff --git a/plat/imx/imx8m/imx8mm/include/imx_sec_def.h b/plat/imx/imx8m/imx8mm/include/imx_sec_def.h
@@ -213,4 +213,26 @@ enum csu_csl_idx {
 	CSU_CSL_CAAM = 114,
 };
 
+enum csu_sa_idx {
+	CSU_SA_M4 = 1 ,
+	CSU_SA_SDMA1 = 2 ,
+	CSU_SA_PCIE_CTRL1 = 3 ,
+	CSU_SA_USB1 = 4 ,
+	CSU_SA_USB2 = 5 ,
+	CSU_SA_VPU = 6 ,
+	CSU_SA_GPU = 7 ,
+	CSU_SA_APBHDMA = 8 ,
+	CSU_SA_ENET = 9 ,
+	CSU_SA_USDHC1 = 10 ,
+	CSU_SA_USDHC2 = 11 ,
+	CSU_SA_USDHC3 = 12 ,
+	CSU_SA_HUGO = 13 ,
+	CSU_SA_DAP = 14 ,
+	CSU_SA_SDMA2 = 15 ,
+	CSU_SA_CAAM = 16 ,
+	CSU_SA_SDMA3 = 17 ,
+	CSU_SA_LCDIF = 18 ,
+	CSU_SA_CSI = 19 ,
+};
+
 #endif /* IMX_SEC_DEF_H */
diff --git a/plat/imx/imx8m/imx8mn/include/imx_sec_def.h b/plat/imx/imx8m/imx8mn/include/imx_sec_def.h
@@ -207,4 +207,22 @@ enum csu_csl_idx {
 	CSU_CSL_OCRAM_S = 119,
 };
 
+enum csu_sa_idx {
+	CSU_SA_M7 = 1 ,
+	CSU_SA_SDMA1 = 2 ,
+	CSU_SA_USB1 = 4 ,
+	CSU_SA_GPU = 7 ,
+	CSU_SA_APBHDMA = 8 ,
+	CSU_SA_ENET1 = 9 ,
+	CSU_SA_USDHC1 = 10 ,
+	CSU_SA_USDHC2 = 11 ,
+	CSU_SA_USDHC3 = 12 ,
+	CSU_SA_HUGO = 13 ,
+	CSU_SA_DAP = 14 ,
+	CSU_SA_SDMA2 = 15 ,
+	CSU_SA_CAAM = 16 ,
+	CSU_SA_SDMA3 = 17 ,
+	CSU_SA_LCDIF = 18 ,
+	CSU_SA_ISI = 19 ,
+};
 #endif /* IMX_SEC_DEF_H */
diff --git a/plat/imx/imx8m/imx8mp/include/imx_sec_def.h b/plat/imx/imx8m/imx8mp/include/imx_sec_def.h
@@ -269,6 +269,40 @@ enum csu_csl_idx {
 	CSU_CSL_OCRAM_A = 113,
 	CSU_CSL_OCRAM = 118,
 	CSU_CSL_OCRAM_S = 119,
+	CSU_CSL_VPU = 120,
 };
 
+enum csu_sa_idx {
+	CSU_SA_M7 = 1 ,
+	CSU_SA_SDMA1 = 2 ,
+	CSU_SA_PCIE_CTRL1 = 3 ,
+	CSU_SA_USB1 = 4 ,
+	CSU_SA_USB2 = 6 ,
+	CSU_SA_APB_HDMA = 8 ,
+	CSU_SA_ENET1 = 9 ,
+	CSU_SA_USDHC1 = 10 ,
+	CSU_SA_USDHC2 = 11 ,
+	CSU_SA_USDHC3 = 12 ,
+	CSU_SA_HUGO = 13 ,
+	CSU_SA_DAP = 14 ,
+	CSU_SA_SDMA2 = 15,
+	CSU_SA_CAAM = 16 ,
+	CSU_SA_SDMA3 = 17 ,
+	CSU_SA_LCDIF1 = 18 ,
+	CSU_SA_ISI = 19 ,
+	CSU_SA_NPU = 20 ,
+	CSU_SA_LCDIF2 = 21 ,
+	CSU_SA_HDMI_TX = 22 ,
+	CSU_SA_ENET2 = 23 ,
+	CSU_SA_GPU3D = 24 ,
+	CSU_SA_GPU2D = 25 ,
+	CSU_SA_VPU_G1 = 26 ,
+	CSU_SA_VPU_G2 = 27 ,
+	CSU_SA_VPU_VC8000E = 28 ,
+	CSU_SA_AUDIO_EDMA = 29 ,
+	CSU_SA_ISP1 = 30 ,
+	CSU_SA_ISP2 = 31 ,
+	CSU_SA_DEWARP = 32 ,
+	CSU_SA_GIC500 = 33 ,
+};
 #endif /* IMX_SEC_DEF_H */
diff --git a/plat/imx/imx8m/include/imx8m_csu.h b/plat/imx/imx8m/include/imx8m_csu.h
@@ -31,7 +31,7 @@
 #define CSU_HP_LOCK(x)		((0x1 << (((x) % 16) * 2 + 1)))
 #define CSU_HP_CFG(x, n)	((x) << (((n) % 16) * 2))
 
-#define CSU_SA_REG(x)		(IMX_CSU_BASE + 0x218)
+#define CSU_SA_REG(x)		(IMX_CSU_BASE + ((x) / 16) * 4 + 0x218)
 #define CSU_SA_LOCK(x)		((0x1 << (((x) % 16) * 2 + 1)))
 #define CSU_SA_CFG(x, n)	((x) << (((n) % 16) * 2))