diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index 139ab593d035..a6a2d42f7f88 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -56,6 +56,7 @@ CONFIG_LIMIT_MOVABLE_ZONE_ALLOC=y
 CONFIG_MSM_BT_POWER=m
 CONFIG_I2C_RTC6226_QCA=m
 CONFIG_SCSI_UFSHCD_QTI=y
+# CONFIG_UFS_DBG is not set
 CONFIG_SCSI_UFS_BSG=y
 CONFIG_MSM_EXT_DISPLAY=y
 CONFIG_SCSI_UFSHCD=y
diff --git a/arch/arm64/configs/vendor/lahaina_consolidate.config b/arch/arm64/configs/vendor/lahaina_consolidate.config
index dfc679287b80..ad2c1315e2e7 100644
--- a/arch/arm64/configs/vendor/lahaina_consolidate.config
+++ b/arch/arm64/configs/vendor/lahaina_consolidate.config
@@ -58,3 +58,4 @@ CONFIG_QCOM_IRQ_STAT=y
 CONFIG_QCOM_INITIAL_LOGBUF=y
 CONFIG_QCOM_DYN_MINIDUMP_STACK=y
 CONFIG_QCOM_MINIDUMP_PANIC_CPU_CONTEXT=y
+CONFIG_UFS_DBG=y