commit fc11a14a4e00c290102d8c48a97511f2396b959a
author Madhukar Pappireddy <madhukar.pappireddy@arm.com> Thu Oct 27 15:24:57 2022 +0200
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Thu Oct 27 15:24:57 2022 +0200
tree f9abc8df3ebb47449fca2e942e38b1329df43772
parent c6eef7e7d35866c25ba48b3ccc5288477bf08655
parent 5a01b45b0cd25fd32d56720c11f95221cfceaf3f

Merge "fix(imx8m): update poweroff related SNVS_LPCR bits only" into integration

plat/imx/imx8m/imx8m_psci_common.c

diff --git a/plat/imx/imx8m/imx8m_psci_common.c b/plat/imx/imx8m/imx8m_psci_common.c
index 4df4f8e..d396902 100644
--- a/plat/imx/imx8m/imx8m_psci_common.c
+++ b/plat/imx/imx8m/imx8m_psci_common.c
@@ -229,8 +229,11 @@
 
 void __dead2 imx_system_off(void)
 {
-	mmio_write_32(IMX_SNVS_BASE + SNVS_LPCR, SNVS_LPCR_SRTC_ENV |
-			SNVS_LPCR_DP_EN | SNVS_LPCR_TOP);
+	uint32_t val;
+
+	val = mmio_read_32(IMX_SNVS_BASE + SNVS_LPCR);
+	val |= SNVS_LPCR_SRTC_ENV | SNVS_LPCR_DP_EN | SNVS_LPCR_TOP;
+	mmio_write_32(IMX_SNVS_BASE + SNVS_LPCR, val);
 
 	while (1)
 		;