diff --git a/arch/arm64/configs/vendor/holi_GKI.config b/arch/arm64/configs/vendor/holi_GKI.config
index 9af93810b690..306fd51159bb 100644
--- a/arch/arm64/configs/vendor/holi_GKI.config
+++ b/arch/arm64/configs/vendor/holi_GKI.config
@@ -201,3 +201,5 @@ CONFIG_INCREMENTAL_FS=y
 CONFIG_BACKLIGHT_QCOM_SPMI_WLED=m
 CONFIG_INTERCONNECT_QCOM_CPUCP_L3=m
 CONFIG_SMB1398_CHARGER=m
+CONFIG_QCOM_WDT_CORE=m
+CONFIG_QCOM_SOC_WATCHDOG=m
diff --git a/arch/arm64/configs/vendor/holi_debug.config b/arch/arm64/configs/vendor/holi_debug.config
index d11865de8349..7f9ec45e14e0 100644
--- a/arch/arm64/configs/vendor/holi_debug.config
+++ b/arch/arm64/configs/vendor/holi_debug.config
@@ -123,3 +123,7 @@ CONFIG_DEBUG_PREEMPT=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_PANIC_ON_DATA_CORRUPTION=y
 CONFIG_INTERCONNECT_QCOM_CPUCP_L3=y
+CONFIG_PM_DEBUG=y
+CONFIG_DEBUG_RWSEMS=y
+CONFIG_WQ_WATCHDOG=y
+CONFIG_LOCK_STAT=y