diff --git a/arch/arm64/configs/vendor/kalama_GKI.config b/arch/arm64/configs/vendor/kalama_GKI.config
index 87325e991b0b..64eb077d130d 100644
--- a/arch/arm64/configs/vendor/kalama_GKI.config
+++ b/arch/arm64/configs/vendor/kalama_GKI.config
@@ -7,6 +7,8 @@ CONFIG_ARM_SMMU_QCOM=m
 CONFIG_COMMON_CLK_QCOM=m
 CONFIG_CPU_IDLE_GOV_QCOM_LPM=m
 # CONFIG_EDAC_QCOM is not set
+CONFIG_GH_VIRT_WATCHDOG=m
+CONFIG_GUNYAH_DRIVERS=y
 CONFIG_HWSPINLOCK_QCOM=m
 CONFIG_INTERCONNECT_QCOM=m
 CONFIG_INTERCONNECT_QCOM_BCM_VOTER=m
@@ -29,6 +31,8 @@ CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_UFS_V4=m
 CONFIG_PINCTRL_KALAMA=m
 CONFIG_PINCTRL_MSM=m
+CONFIG_POWER_RESET_QCOM_DOWNLOAD_MODE=m
+CONFIG_POWER_RESET_QCOM_DOWNLOAD_MODE_DEFAULT=y
 CONFIG_POWER_RESET_QCOM_REBOOT_REASON=m
 CONFIG_QCOM_AOSS_QMP=m
 CONFIG_QCOM_CLK_RPMH=m
@@ -40,6 +44,7 @@ CONFIG_QCOM_DMABUF_HEAPS_PAGE_POOL_REFILL=y
 CONFIG_QCOM_DMABUF_HEAPS_SYSTEM=y
 CONFIG_QCOM_DMABUF_HEAPS_SYSTEM_SECURE=y
 CONFIG_QCOM_EUD=m
+CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
 CONFIG_QCOM_GDSC_REGULATOR=m
 CONFIG_QCOM_IOMMU_UTIL=m
 CONFIG_QCOM_IPCC=m
@@ -63,8 +68,16 @@ CONFIG_QCOM_SMP2P=m
 CONFIG_QCOM_SMP2P_SLEEPSTATE=m
 # CONFIG_QCOM_SMSM is not set
 CONFIG_QCOM_SOCINFO=m
+# CONFIG_QCOM_SOC_WATCHDOG is not set
 # CONFIG_QCOM_STATS is not set
+CONFIG_QCOM_WATCHDOG_BARK_TIME=11000
+CONFIG_QCOM_WATCHDOG_IPI_PING=y
+CONFIG_QCOM_WATCHDOG_PET_TIME=9360
+# CONFIG_QCOM_WATCHDOG_USERSPACE_PET is not set
+CONFIG_QCOM_WATCHDOG_WAKEUP_ENABLE=y
 # CONFIG_QCOM_WCNSS_PIL is not set
+# CONFIG_QCOM_WDOG_BITE_EARLY_PANIC is not set
+CONFIG_QCOM_WDT_CORE=m
 CONFIG_QTI_PMIC_EUSB2_REPEATER=m
 CONFIG_REGMAP_SPMI=m
 CONFIG_REGULATOR_DEBUG_CONTROL=m
@@ -97,3 +110,4 @@ CONFIG_USB_MSM_EUSB2_PHY=m
 CONFIG_USB_MSM_SSPHY_QMP=m
 CONFIG_USB_REPEATER=m
 # CONFIG_VIDEO_QCOM_VENUS is not set
+CONFIG_VIRT_DRIVERS=y
diff --git a/modules.list.msm.kalama b/modules.list.msm.kalama
index 46709a3a4e36..082dc061d805 100644
--- a/modules.list.msm.kalama
+++ b/modules.list.msm.kalama
@@ -1,3 +1,5 @@
+qcom_wdt_core.ko
+gh_virt_wdt.ko
 clk-rpmh.ko
 gcc-kalama.ko
 icc-rpmh.ko
@@ -25,6 +27,7 @@ mem_buf_dev.ko
 mem_buf.ko
 msm_dma_iommu_mapping.ko
 pinctrl-kalama.ko
+qcom-dload-mode.ko
 qnoc-kalama.ko
 phy-qcom-ufs.ko
 phy-qcom-ufs-qmp-v4-kalama.ko