diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index b73690cc948c..cdefa99b72de 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -53,3 +53,19 @@ CONFIG_DEVFREQ_SIMPLE_DEV=y
 CONFIG_QCOM_DEVFREQ_ICC=y
 CONFIG_QCOM_LLCC_PMU=y
 CONFIG_QTI_TZ_LOG=y
+CONFIG_QCOM_MEMORY_DUMP_V2=y
+CONFIG_MSM_REMOTEQDSS=y
+CONFIG_QCOM_DCC_V2=y
+CONFIG_CORESIGHT_QGKI=y
+CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
+CONFIG_CORESIGHT_CTI=y
+CONFIG_CORESIGHT_TPDA=y
+CONFIG_CORESIGHT_TPDM=y
+CONFIG_CORESIGHT_HWEVENT=y
+CONFIG_CORESIGHT_DUMMY=y
+CONFIG_CORESIGHT_REMOTE_ETM=y
+CONFIG_CORESIGHT_TGU=y
+# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
+# CONFIG_CORESIGHT_CATU is not set
+# CONFIG_CORESIGHT_CTI_SAVE_DISABLE is not set
+# CONFIG_CORESIGHT_TPDM_DEFAULT_ENABLE is not set
diff --git a/arch/arm64/configs/vendor/lahaina_debug.config b/arch/arm64/configs/vendor/lahaina_debug.config
index 6fd94723c992..d19fd9d913e1 100644
--- a/arch/arm64/configs/vendor/lahaina_debug.config
+++ b/arch/arm64/configs/vendor/lahaina_debug.config
@@ -24,6 +24,7 @@ CONFIG_I3C=y
 CONFIG_I3C_MASTER_MSM_GENI=y
 # CONFIG_CDNS_I3C_MASTER is not set
 # CONFIG_DW_I3C_MASTER is not set
+CONFIG_CORESIGHT_SOURCE_ETM4X=y
 CONFIG_PCI_MSM=y
 CONFIG_PCI_MSM_MSI=y
 # CONFIG_CNSS2 is not set
diff --git a/drivers/hwtracing/coresight/Kconfig b/drivers/hwtracing/coresight/Kconfig
index 9d99c2847583..8f8b875d9706 100644
--- a/drivers/hwtracing/coresight/Kconfig
+++ b/drivers/hwtracing/coresight/Kconfig
@@ -266,7 +266,7 @@ config CORESIGHT_TGU
 
 config CORESIGHT_OST
 	bool "CoreSight OST framework"
-	depends on CORESIGHT_STM && COREISGHT_QGKI
+	depends on CORESIGHT_STM && CORESIGHT_QGKI
 	help
 	  This driver enables the support for Open System Trace packets in STM.
 	  This is primarily intended to be used as a layer on top of underlying