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

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

Merge "ASoC: msm: Add support for 192KHz sampling rate"

parents bccca4c8 452836f4

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

+9 −2
Original line number Diff line number Diff line
@@ -182,6 +182,12 @@ Optional properties: 
 - qcom,msm-pcm-loopback-low-latency : Flag indicating whether

   the device node is of type low latency.



* msm-transcode-loopback



Required properties:



 - compatible : "qcom,msm-transcode-loopback"



* msm-dai-q6



[First Level Nodes]
@@ -2401,14 +2407,15 @@ Example: 
		qcom,tasha-mclk-clk-freq = <9600000>;

		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&cpe>, <&compr>;

				<&afe>, <&lsm>, <&routing>, <&cpe>, <&compr>,

				<&trans_loopback>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-pcm-dsp.2", "msm-voip-dsp",

				"msm-pcm-voice", "msm-pcm-loopback",

				"msm-compress-dsp", "msm-pcm-hostless",

				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-cpe-lsm",

				"msm-compr-dsp";

				"msm-compr-dsp","msm-transcode-loopback";

		asoc-cpu = <&dai_hdmi>,

				<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,

				<&sb_2_rx>, <&sb_2_tx>, <&sb_3_rx>, <&sb_3_tx>,

arch/arm/boot/dts/qcom/msm-audio-lpass.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -85,6 +85,10 @@ 
		compatible = "qcom,msm-pcm-loopback";

	};



	trans_loopback: qcom,msm-transcode-loopback {

		compatible = "qcom,msm-transcode-loopback";

	};



	qcom,msm-dai-mi2s {

		compatible = "qcom,msm-dai-mi2s";

		dai_mi2s0: qcom,msm-dai-q6-mi2s-prim {

arch/arm/boot/dts/qcom/msm8998-audio.dtsi

+5 −4
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&cpe>, <&compr>,

				<&pcm_noirq>, <&cpe3>;

				<&pcm_noirq>, <&cpe3>, <&trans_loopback>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-pcm-dsp.2", "msm-voip-dsp",

				"msm-pcm-voice", "msm-pcm-loopback",
@@ -97,7 +97,7 @@ 
				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-cpe-lsm",

				"msm-compr-dsp", "msm-pcm-dsp-noirq",

				"msm-cpe-lsm.3";

				"msm-cpe-lsm.3", "msm-transcode-loopback";

		asoc-cpu = <&dai_hdmi>, <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,
@@ -222,14 +222,15 @@ 
		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&cpe>, <&compr>,

				<&pcm_noirq>;

				<&pcm_noirq>, <&trans_loopback>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-pcm-dsp.2", "msm-voip-dsp",

				"msm-pcm-voice", "msm-pcm-loopback",

				"msm-compress-dsp", "msm-pcm-hostless",

				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-cpe-lsm",

				"msm-compr-dsp", "msm-pcm-dsp-noirq";

				"msm-compr-dsp", "msm-pcm-dsp-noirq",

				"msm-transcode-loopback";

		asoc-cpu = <&dai_hdmi>, <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

include/sound/apr_audio-v2.h

+5 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ struct param_outband { 


#define ADM_MATRIX_ID_COMPRESSED_AUDIO_RX   2



#define ADM_MATRIX_ID_COMPRESSED_AUDIO_TX   3



#define ADM_MATRIX_ID_LISTEN_TX             4

/* Enumeration for an audio Tx matrix ID.*/

#define ADM_MATRIX_ID_AUDIOX              1
@@ -446,6 +448,9 @@ struct adm_param_data_v5 { 


#define ASM_STREAM_CMD_REGISTER_PP_EVENTS 0x00013213

#define ASM_STREAM_PP_EVENT 0x00013214

#define ASM_STREAM_CMD_REGISTER_IEC_61937_FMT_UPDATE 0x13333

#define ASM_IEC_61937_MEDIA_FMT_EVENT 0x13334



#define DSP_STREAM_CMD "ADSP Stream Cmd"

#define DSP_STREAM_CALLBACK "ADSP Stream Callback Event"

#define DSP_STREAM_CALLBACK_QUEUE_SIZE 1024

include/sound/q6adm-v2.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define ADM_PATH_LIVE_REC 0x2

#define ADM_PATH_NONLIVE_REC 0x3

#define ADM_PATH_COMPRESSED_RX 0x5

#define ADM_PATH_COMPRESSED_TX 0x6

#include <linux/qdsp6v2/rtac.h>

#include <sound/q6afe-v2.h>

#include <sound/q6audio-v2.h>