Revert "MA-20141 imx8m: enable alarm when shutdown"

This reverts commit 4fe65a0. This revert fixes the poweroff and shutdown commands issue for imx8m, imx8mm and imx8mn avoiding the reboot after running poweroff or shutdown commands from linux userspace. Derived from commit 5cf21f5. Signed-off-by: Alifer Moraes <alifer.m@variscite.com>
varigit · Sep 25, 2023 · 77a5654 · 77a5654
1 parent 53e2b6a
commit 77a5654
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 10 deletions.
diff --git a/plat/imx/imx8m/imx8m_psci_common.c b/plat/imx/imx8m/imx8m_psci_common.c
@@ -251,8 +251,7 @@ void __dead2 imx_system_off(void)
 	uint32_t val;
 
 	val = mmio_read_32(IMX_SNVS_BASE + SNVS_LPCR);
-	val |= SNVS_LPCR_SRTC_ENV | SNVS_LPCR_DP_EN | SNVS_LPCR_TOP |
-		SNVS_LPCR_LPTA_EN | SNVS_LPCR_LPWUI_EN;
+	val |= SNVS_LPCR_SRTC_ENV | SNVS_LPCR_DP_EN | SNVS_LPCR_TOP;
 	mmio_write_32(IMX_SNVS_BASE + SNVS_LPCR, val);
 
 	while (1)

diff --git a/plat/imx/imx8m/imx8mm/include/platform_def.h b/plat/imx/imx8m/imx8mm/include/platform_def.h
@@ -160,8 +160,6 @@
 
 #define SNVS_LPCR			U(0x38)
 #define SNVS_LPCR_SRTC_ENV		BIT(0)
-#define SNVS_LPCR_LPTA_EN		BIT(1)
-#define SNVS_LPCR_LPWUI_EN		BIT(3)
 #define SNVS_LPCR_DP_EN			BIT(5)
 #define SNVS_LPCR_TOP			BIT(6)
 

diff --git a/plat/imx/imx8m/imx8mn/include/platform_def.h b/plat/imx/imx8m/imx8mn/include/platform_def.h
@@ -135,8 +135,6 @@
 
 #define SNVS_LPCR			U(0x38)
 #define SNVS_LPCR_SRTC_ENV		BIT(0)
-#define SNVS_LPCR_LPTA_EN		BIT(1)
-#define SNVS_LPCR_LPWUI_EN		BIT(3)
 #define SNVS_LPCR_DP_EN			BIT(5)
 #define SNVS_LPCR_TOP			BIT(6)
 

diff --git a/plat/imx/imx8m/imx8mp/include/platform_def.h b/plat/imx/imx8m/imx8mp/include/platform_def.h
@@ -174,8 +174,6 @@
 
 #define SNVS_LPCR			U(0x38)
 #define SNVS_LPCR_SRTC_ENV		BIT(0)
-#define SNVS_LPCR_LPTA_EN		BIT(1)
-#define SNVS_LPCR_LPWUI_EN		BIT(3)
 #define SNVS_LPCR_DP_EN			BIT(5)
 #define SNVS_LPCR_TOP			BIT(6)
 

diff --git a/plat/imx/imx8m/imx8mq/include/platform_def.h b/plat/imx/imx8m/imx8mq/include/platform_def.h
@@ -127,8 +127,6 @@
 
 #define SNVS_LPCR			U(0x38)
 #define SNVS_LPCR_SRTC_ENV		BIT(0)
-#define SNVS_LPCR_LPTA_EN		BIT(1)
-#define SNVS_LPCR_LPWUI_EN		BIT(3)
 #define SNVS_LPCR_DP_EN			BIT(5)
 #define SNVS_LPCR_TOP			BIT(6)