Merge "ARM: dts: msm: add snd evt nodes for sa8155 auto platform" (71853fe0) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1707,6 +1707,7 @@ Optional properties:
		- qcom,mi2s-audio-intf : Property to specify if MI2S interface is used for the target
		- qcom,auxpcm-audio-intf : Property to specify if AUX PCM interface is used for the target
		- qcom,msm-mi2s-master : List of master/slave configuration for MI2S interfaces
		- qcom,msm_audio_ssr_devs: List the snd event framework clients

		Example:

		@@ -1795,6 +1796,7 @@ Example:
		"msm-dai-q6-tdm.36935";
		asoc-codec = <&stub_codec>;
		asoc-codec-names = "msm-stub-codec.1";
		qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>;
		};

		* SDX ASoC Machine driver

+7 −0

Original line number	Diff line number	Diff line
		@@ -441,6 +441,10 @@
		};

		&audio_apr {
		q6core: qcom,q6core-audio {
		compatible = "qcom,q6core-audio";
		};

		snd_9360: sound-pahu {
		status = "disabled";
		};
		@@ -448,7 +452,9 @@
		snd_934x: sound-tavil {
		status = "disabled";
		};
		};

		&q6core {
		sound-adp-star {
		compatible = "qcom,sa8155-asoc-snd-adp-star";
		qcom,model = "sa8155-adp-star-snd-card";
		@@ -536,6 +542,7 @@
		"msm-dai-q6-tdm.36935";
		asoc-codec = <&stub_codec>;
		asoc-codec-names = "msm-stub-codec.1";
		qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>;
		};
		};

+7 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,12 @@
		};

		&audio_apr {
		q6core: qcom,q6core-audio {
		compatible = "qcom,q6core-audio";
		};
		};

		&q6core {
		sound-adp-star {
		compatible = "qcom,sa8155-asoc-snd-adp-star";
		qcom,model = "sa8155-adp-star-snd-card";
		@@ -505,6 +511,7 @@
		"msm-dai-q6-tdm.36935";
		asoc-codec = <&stub_codec>;
		asoc-codec-names = "msm-stub-codec.1";
		qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>;
		};
		};