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

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

Merge "ARM: dts: msm: add audio ion vm dev on msm8996 vplatform"

parents 949c5556 7dfae052

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

+20 −0
Original line number Diff line number Diff line
@@ -1096,6 +1096,26 @@ qcom,msm-audio-ion { 
	qcom,smmu-enabled;

};



* msm-audio-ion-vm



Required properties:

 - compatible : "qcom,msm-audio-ion-vm"



Optional properties:

 - qcom,smmu-enabled:

	It is possible that some MSM have SMMU in ADSP.  While other

	MSM use no SMMU. Audio lib introduce wrapper for ION APIs.

	The wrapper needs presence of SMMU in ADSP to handle ION

	APIs differently. Presence of this property means ADSP has

	SMMU in it.



Example:



qcom,msm-audio-ion-vm {

	compatible = "qcom,msm-audio-ion-vm;

	qcom,smmu-enabled;

};



* MSM8994 ASoC Machine driver



Required properties:

arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dts

+5 −0
Original line number Diff line number Diff line
@@ -184,6 +184,11 @@ 
		iommus = <&lpass_q6_smmu 1>;

	};



	qcom,msm-audio-ion-vm {

		compatible = "qcom,msm-audio-ion-vm";

		qcom,smmu-enabled;

	};



	pcm0: qcom,msm-pcm {

		compatible = "qcom,msm-pcm-dsp";

		qcom,msm-pcm-dsp-id = <0>;

drivers/soc/qcom/Kconfig

+11 −1
Original line number Diff line number Diff line
@@ -616,6 +616,15 @@ config MSM_QDSP6_APRV2 
          used by audio driver to configure QDSP6's

          ASM, ADM and AFE.



config MSM_QDSP6_APRV2_VM

        bool "Audio QDSP6 APRv2 virtualization support"

        depends on MSM_HAB

        help

          Enable APRv2 IPC protocol support over

          HAB 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
@@ -800,7 +809,8 @@ config MSM_EVENT_TIMER 


config MSM_AVTIMER

	tristate "Avtimer Driver"

	depends on MSM_QDSP6_APRV2 || MSM_QDSP6_APRV3 || MSM_QDSP6_APRV2_GLINK

	depends on MSM_QDSP6_APRV2 || MSM_QDSP6_APRV3 || MSM_QDSP6_APRV2_GLINK || \

		MSM_QDSP6_APRV2_VM

	help

		This driver gets the Q6 out of power collapsed state and

		exposes ioctl control to read avtimer tick.

drivers/soc/qcom/qdsp6v2/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@ obj-$(CONFIG_MSM_QDSP6_APRV2) += apr.o apr_v2.o apr_tal.o voice_svc.o 
obj-$(CONFIG_MSM_QDSP6_APRV3) += apr.o apr_v3.o apr_tal.o voice_svc.o

obj-$(CONFIG_MSM_QDSP6_APRV2_GLINK) += apr.o apr_v2.o apr_tal_glink.o voice_svc.o

obj-$(CONFIG_MSM_QDSP6_APRV3_GLINK) += apr.o apr_v3.o apr_tal_glink.o voice_svc.o

obj-$(CONFIG_MSM_QDSP6_APRV2_VM) += apr_vm.o apr_v2.o voice_svc.o

obj-$(CONFIG_SND_SOC_MSM_QDSP6V2_INTF) += msm_audio_ion.o

obj-$(CONFIG_SND_SOC_QDSP6V2_VM) += msm_audio_ion_vm.o

obj-$(CONFIG_MSM_ADSP_LOADER) += adsp-loader.o

obj-$(CONFIG_MSM_QDSP6_SSR) += audio_ssr.o

obj-$(CONFIG_MSM_QDSP6_PDR) += audio_pdr.o

drivers/soc/qcom/qdsp6v2/apr_vm.c

0 → 100644
+1270 −0

File added.

Preview size limit exceeded, changes collapsed.