Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e24a04d5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: soc: Merge soc/qti into soc/qcom"

parents 373c0a5b bede9d04

drivers/soc/Kconfig

+0 −1
Original line number Diff line number Diff line 
source "drivers/soc/qcom/Kconfig"
 
source "drivers/soc/qti/Kconfig"

drivers/soc/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_ARCH_MSM)		+= qcom/
 
obj-y				+= qti/

drivers/soc/qcom/Kconfig

+28 −0
Original line number Diff line number Diff line
@@ -10,6 +10,34 @@ config MSM_SMEM 
	  processors in the System on a Chip (SoC) which allows basic

	  inter-processor communication.



config MSM_QDSP6_APRV2

	bool "Audio QDSP6 APRv2 support"

	depends on MSM_SMD

	help

	  Enable APRv2 IPC protocol support between

	  application processor and QDSP6. APR is

	  used by audio driver to configure QDSP6's

	  ASM, ADM and AFE.



config MSM_QDSP6_APRV3

	bool "Audio QDSP6 APRv3 support"

	depends on MSM_SMD

	help

	  Enable APRv2 IPC protocol support between

	  application processor and QDSP6. APR is

	  used by audio driver to configure QDSP6v2's

	  ASM, ADM and AFE.



config MSM_ADSP_LOADER

	tristate "ADSP loader support"

	select SND_SOC_MSM_APRV2_INTF

	depends on MSM_QDSP6_APRV2 || MSM_QDSP6_APRV3

	help

	  Enable ADSP image loader.

	  The ADSP loader brings ADSP out of reset

	  for the platforms that use APRv2.

	  Say M if you want to enable this module.



source "drivers/soc/qcom/memshare/Kconfig"



endif # ARCH_MSM

drivers/soc/qcom/Makefile

+2 −0
Original line number Diff line number Diff line 
# When adding new entries keep the list in alphabetical order



obj-y		+= qdsp6v2/



obj-$(CONFIG_MSM_SMEM) += smem.o smem_debug.o

obj-$(CONFIG_MSM_QMI_INTERFACE)		+= memshare/