diff --git a/arch/arm64/boot/dts/freescale/imx8mp-mecha-comet.dts b/arch/arm64/boot/dts/freescale/imx8mp-mecha-comet.dts
index 01905c6e7983..f4ed92d8e301 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-mecha-comet.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-mecha-comet.dts
@@ -163,6 +163,7 @@
 			label = "Home-Button";
 			linux,input-type = <EV_KEY>;
 			linux,code = <KEY_HOME>;
+			wakeup-source;
 			gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>;
 		};
 	};
diff --git a/arch/arm64/configs/mecha_v8_defconfig b/arch/arm64/configs/mecha_v8_defconfig
index f2b862316674..55a39dd218bb 100644
--- a/arch/arm64/configs/mecha_v8_defconfig
+++ b/arch/arm64/configs/mecha_v8_defconfig
@@ -1278,7 +1278,7 @@ CONFIG_AUDIT=n
 
 CONFIG_ANDROID_BINDER_IPC=y
 CONFIG_PSI=y
-CONFIG_PSI_DEFAULT_DISABLED=n
+CONFIG_PSI_DEFAULT_DISABLED=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_SLUB_MEMCG_SYSFS_ON=y