diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index 98021bb9fb20..62dbf7892303 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -19,6 +19,9 @@ CONFIG_MSM_CORE_HANG_DETECT=m
 CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_LAHAINA_LLCC=m
 CONFIG_QCOM_IPCC=m
+CONFIG_QCOM_SCM=m
+CONFIG_QTEE_SHM_BRIDGE=y
+# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y
 CONFIG_HWSPINLOCK_QCOM=m
 CONFIG_QCOM_SMEM=m
diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index 59511471a539..f0320692beb0 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -27,6 +27,3 @@ CONFIG_MSM_GLOBAL_SYNX=y
 CONFIG_MSM_CVP=y
 CONFIG_ION_POOL_AUTO_REFILL=y
 CONFIG_MSM_BT_POWER=m
-CONFIG_QCOM_SCM=y
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-CONFIG_QTEE_SHM_BRIDGE=y
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index a37ed1a677de..b3da58e1c44e 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -235,7 +235,7 @@ config INTEL_STRATIX10_RSU
 	  Say Y here if you want Intel RSU support.
 
 config QCOM_SCM
-	bool "Qualcomm Technologies, Inc. SCM Interface"
+	tristate "Qualcomm Technologies, Inc. SCM Interface"
 	depends on ARM || ARM64
 	select RESET_CONTROLLER
 	help