diff --git a/plat/imx/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8mm/imx8mm_bl31_setup.c
index 70eba9a..0eb025e 100644
--- a/plat/imx/imx8mm/imx8mm_bl31_setup.c
+++ b/plat/imx/imx8mm/imx8mm_bl31_setup.c
@@ -198,8 +198,6 @@
 
 void bl31_platform_setup(void)
 {
-	/* enable the GIC clock */
-	mmio_write_32(0x303845c0, 0x3);
 	/* init the GICv3 cpu and distributor interface */
 	plat_gic_driver_init();
 	plat_gic_init();
diff --git a/plat/imx/imx8mm/imx8mm_psci.c b/plat/imx/imx8mm/imx8mm_psci.c
index b0074c2..721e1a4 100644
--- a/plat/imx/imx8mm/imx8mm_psci.c
+++ b/plat/imx/imx8mm/imx8mm_psci.c
@@ -79,8 +79,7 @@
 
 	if (pwr_type == PSTATE_TYPE_POWERDOWN && state_id == 0x33) {
 		CORE_PWR_STATE(req_state) = PLAT_MAX_OFF_STATE;
-	//	CLUSTER_PWR_STATE(req_state) = PLAT_WAIT_OFF_STATE;
-		CLUSTER_PWR_STATE(req_state) = PLAT_MAX_RET_STATE;
+		CLUSTER_PWR_STATE(req_state) = PLAT_WAIT_OFF_STATE;
 	}
 
 	return PSCI_E_SUCCESS;