diff --git a/arch/arm64/configs/vendor/pineapple_GKI.config b/arch/arm64/configs/vendor/pineapple_GKI.config
index 46478adeab6e..d1ff72c9ba61 100644
--- a/arch/arm64/configs/vendor/pineapple_GKI.config
+++ b/arch/arm64/configs/vendor/pineapple_GKI.config
@@ -66,6 +66,7 @@ CONFIG_MSM_GPI_DMA=m
 CONFIG_MSM_PERFORMANCE=m
 CONFIG_MSM_QMP=m
 CONFIG_MSM_RDBG=m
+CONFIG_MSM_TMECOM_QMP=m
 # CONFIG_NITRO_ENCLAVES is not set
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NVMEM_SPMI_SDAM=m
@@ -162,6 +163,7 @@ CONFIG_QTI_BCL_PMIC5=m
 CONFIG_QTI_BCL_SOC_DRIVER=m
 CONFIG_QTI_CHARGER_ULOG_GLINK=m
 CONFIG_QTI_CPUCP_LOG=m
+CONFIG_QTI_HW_KEY_MANAGER=m
 CONFIG_QTI_PMIC_EUSB2_REPEATER=m
 CONFIG_QTI_PMIC_GLINK=m
 # CONFIG_QTI_PMIC_GLINK_CLIENT_DEBUG is not set
diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile
index 53ac28987861..53d161e75c09 100644
--- a/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile
@@ -53,9 +53,11 @@ obj-$(CONFIG_MSM_BOOT_STATS) += boot_stats.o
 obj-$(CONFIG_QCOM_RUN_QUEUE_STATS) += rq_stats.o
 obj-$(CONFIG_MSM_CORE_HANG_DETECT) += core_hang_detect.o
 obj-$(CONFIG_QCOM_CPU_VENDOR_HOOKS) += qcom_cpu_vendor_hooks.o
-obj-$(CONFIG_QTI_CRYPTO_COMMON) += crypto-qti-common.o
-obj-$(CONFIG_QTI_CRYPTO_TZ) += crypto-qti-tz.o
-obj-$(CONFIG_QTI_HW_KEY_MANAGER) += hwkm.o crypto-qti-hwkm.o
+obj-$(CONFIG_QTI_CRYPTO_COMMON) += crypto-qti.o
+crypto-qti-y += crypto-qti-common.o
+crypto-qti-$(CONFIG_QTI_CRYPTO_TZ) += crypto-qti-tz.o
+crypto-qti-$(CONFIG_QTI_HW_KEY_MANAGER) += crypto-qti-hwkm.o
+obj-$(CONFIG_QTI_HW_KEY_MANAGER) += hwkm.o
 obj-$(CONFIG_MSM_TMECOM_QMP) += tmecom/
 obj-$(CONFIG_QCOM_MINIDUMP) += minidump.o
 minidump-y   += msm_minidump.o minidump_log.o