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

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

Merge "ASoC: mdm9607: Add changes for different modes of I2S and Auxpcm"

parents ab575eea 0a379051
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -1740,8 +1740,6 @@ Each entry is a pair of strings, the first being the connection's sink,
the second being the connection's source.
- qcom,tomtom-mclk-clk-freq : Master clock value given to codec. Some WCD9XXX
codec can run at different mclk values. Mclk value can be 9.6MHz or 12.288MHz.
- pinctrl-names : pinctrl state names for each pin group configuration.
- pinctrl-x : defines pinctrl state for each pin group
- asoc-platform: This is phandle list containing the references to platform device
		 nodes that are used as part of the sound card dai-links.
- asoc-platform-names: This property contains list of platform names. The order of
@@ -1760,6 +1758,14 @@ codec can run at different mclk values. Mclk value can be 9.6MHz or 12.288MHz.
		    codec dai names should match to that of the phandle order given
		    in "asoc-codec".

Optional Properties:
- qcom,mi2s-interface-mode: This property contains mi2s interface modes master/ slave.
			    Entry is a pair of strings, the first being for primary mi2s
			    and the second for secondary mi2s and so on
- qcom,auxpcm-interface-mode: This property contains auxpcm interface modes master/ slave.
			      Entry is a pair of strings, the first being for primary auxpcm
			      and the second for secondary auxpcm and so on

Example:

sound {
@@ -1783,6 +1789,8 @@ sound {
			"MIC BIAS3 External", "Digital Mic3";

		qcom,tomtom-mclk-clk-freq = <12288000>;
		qcom,mi2s-interface-mode = "pri_mi2s_master", "sec_mi2s_master";
		qcom,auxpcm-interface-mode = "pri_pcm_master", "sec_pcm_master";
		asoc-platform = <&pcm0>, <&pcm1>, <&voip>, <&voice>,
				<&loopback>, <&hostless>, <&afe>, <&routing>,
				<&pcm_dtmf>, <&host_pcm>;
+684 −162

File changed.

Preview size limit exceeded, changes collapsed.