diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index 2951b0bad92e..4bd75b37fb12 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -108,7 +108,6 @@ CONFIG_MSM_BT_POWER=m
 CONFIG_ARM_SMMU=m
 CONFIG_MSM_CLK_AOP_QMP=m
 CONFIG_MSM_SPSS_UTILS=m
-CONFIG_QCOM_MINIDUMP=m
 CONFIG_IPA3=m
 CONFIG_IPA_WDI_UNIFIED_API=y
 CONFIG_CNSS2=m
diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index d2a518956f4f..5e3c61b90f55 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -34,6 +34,7 @@ CONFIG_MSM_QBT_HANDLER=y
 CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMORY_HOTPLUG_MOVABLE_NODE=y
 CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_QCOM_MINIDUMP=y
 CONFIG_QCOM_MEM_OFFLINE=y
 CONFIG_OVERRIDE_MEMORY_LIMIT=y
 CONFIG_QCOM_MEM_BUF=y
diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c
index fdf099b5b89b..4922b787bf43 100644
--- a/drivers/power/reset/msm-poweroff.c
+++ b/drivers/power/reset/msm-poweroff.c
@@ -36,7 +36,7 @@
 #define SCM_DLOAD_FULLDUMP		QCOM_DOWNLOAD_FULLDUMP
 #define SCM_EDLOAD_MODE			QCOM_DOWNLOAD_EDL
 #define SCM_DLOAD_MINIDUMP		QCOM_DOWNLOAD_MINIDUMP
-#define SCM_DLOAD_BOTHDUMPS		QCOM_DOWNLOAD_BOTHDUMP
+#define SCM_DLOAD_BOTHDUMPS	(SCM_DLOAD_FULLDUMP | SCM_DLOAD_MINIDUMP)
 
 #define DL_MODE_PROP "qcom,msm-imem-download_mode"
 #define EDL_MODE_PROP "qcom,msm-imem-emergency_download_mode"
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig
index c918dfcdec9a..3906c604fe93 100644
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
@@ -449,7 +449,7 @@ config QCOM_DCC_V2
 
 config QCOM_MINIDUMP
 	tristate "QCOM Minidump Support"
-	depends on QCOM_SMEM && POWER_RESET_QCOM
+	depends on QCOM_SMEM && POWER_RESET_MSM
 	help
 	  This enables minidump feature. It allows various clients to
 	  register to dump their state at system bad state (panic/WDT,etc.,).
diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h
index bf0e2bbc40e6..49e8600e1f88 100644
--- a/include/linux/qcom_scm.h
+++ b/include/linux/qcom_scm.h
@@ -18,6 +18,7 @@ enum qcom_download_mode {
 	QCOM_DOWNLOAD_NODUMP	= 0x00,
 	QCOM_DOWNLOAD_EDL	= 0x01,
 	QCOM_DOWNLOAD_FULLDUMP	= 0x10,
+	QCOM_DOWNLOAD_MINIDUMP	= 0x20,
 };
 
 struct qcom_scm_hdcp_req {