Merge "defconfig: pineapple-gki: Enable MPROC drivers"

arch/arm64/configs/vendor/pineapple_GKI.config

@@ -10,17 +10,21 @@ CONFIG_INTERCONNECT_QCOM=m
 CONFIG_INTERCONNECT_QCOM_DEBUG=m
 CONFIG_INTERCONNECT_QCOM_PINEAPPLE=m
 CONFIG_INTERCONNECT_TEST=m
+CONFIG_IPC_LOGGING=m
+CONFIG_IPC_LOG_MINIDUMP_BUFFERS=0
 CONFIG_LOCALVERSION="-gki"
 # CONFIG_MODULE_SIG_ALL is not set
 CONFIG_MSM_BOOT_STATS=m
 # CONFIG_MSM_BOOT_TIME_MARKER is not set
 CONFIG_MSM_CORE_HANG_DETECT=m
+CONFIG_MSM_QMP=m
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_UFS_QRBTC_SDM845=m
 CONFIG_PINCTRL_MSM=m
 CONFIG_PINCTRL_PINEAPPLE=m
 CONFIG_POWER_RESET_QCOM_REBOOT_REASON=m
+CONFIG_QCOM_AOSS_QMP=m
 CONFIG_QCOM_CLK_RPMH=m
 CONFIG_QCOM_COMMAND_DB=m
 CONFIG_QCOM_DMABUF_HEAPS=m
@@ -48,17 +52,21 @@ CONFIG_QCOM_SCM=m
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 CONFIG_QCOM_SECURE_BUFFER=m
 CONFIG_QCOM_SMEM=m
-# CONFIG_QCOM_SMP2P is not set
+CONFIG_QCOM_SMP2P=m
+CONFIG_QCOM_SMP2P_SLEEPSTATE=m
 # CONFIG_QCOM_SMSM is not set
 CONFIG_QCOM_SOCINFO=m
 # CONFIG_QCOM_STATS is not set
 # CONFIG_QCOM_WCNSS_PIL is not set
+CONFIG_QRTR=m
+CONFIG_QRTR_SMD=m
 CONFIG_REGULATOR_DEBUG_CONTROL=m
 CONFIG_REGULATOR_PROXY_CONSUMER=m
 # CONFIG_REGULATOR_PROXY_CONSUMER_LEGACY is not set
 CONFIG_REGULATOR_RPMH=m
 CONFIG_REGULATOR_STUB=m
-# CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
+CONFIG_RPMSG_QCOM_GLINK=m
+CONFIG_RPMSG_QCOM_GLINK_SMEM=m
 # CONFIG_RPMSG_QCOM_SMD is not set
 CONFIG_SCSI_UFS_QCOM=m
 CONFIG_SM_CAMCC_PINEAPPLE=m

kernel/trace/Kconfig

@@ -130,7 +130,6 @@ config PREEMPTIRQ_TRACEPOINTS
 
 config IPC_LOGGING
 	tristate "Debug Logging for IPC Drivers"
-	select GENERIC_TRACER
 	depends on DEBUG_FS
 	help
 	  IPC Logging driver provides a logging option for IPC Drivers.