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

Commit af2d0894 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: update quinary mi2s dai id for sdm670"

parents d4c92160 fc05e49e

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

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 


		dai_mi2s4: qcom,msm-dai-q6-mi2s-quin {

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

			qcom,msm-dai-q6-mi2s-dev-id = <5>;

			qcom,msm-dai-q6-mi2s-dev-id = <4>;

			qcom,msm-mi2s-rx-lines = <1>;

			qcom,msm-mi2s-tx-lines = <2>;

		};

arch/arm64/boot/dts/qcom/sdm670-audio.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
			<&dai_quin_tdm_rx_0>, <&dai_quin_tdm_tx_0>;

		asoc-cpu-names = "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

			"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

			"msm-dai-q6-mi2s.5",

			"msm-dai-q6-mi2s.4",

			"msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

			"msm-dai-q6-auxpcm.3", "msm-dai-q6-auxpcm.4",

			"msm-dai-q6-auxpcm.5",
@@ -136,7 +136,7 @@ 
			<&dai_quin_tdm_rx_0>, <&dai_quin_tdm_tx_0>;

		asoc-cpu-names = "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

			"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

			"msm-dai-q6-mi2s.5",

			"msm-dai-q6-mi2s.4",

			"msm-dai-q6-mi2s.7", "msm-dai-q6-mi2s.8",

			"msm-dai-q6-mi2s.9", "msm-dai-q6-mi2s.10",

			"msm-dai-q6-mi2s.11", "msm-dai-q6-mi2s.12",