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

Commit 839e644e 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 support for TDM"

parents 125777be c01ffb6f

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

+38 −0
Original line number Diff line number Diff line
@@ -370,4 +370,42 @@ 
		compatible = "qcom,adsp-loader";

		qcom,adsp-state = <0>;

	};



	qcom,msm-dai-tdm-tert-rx {

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

		qcom,msm-cpudai-tdm-group-id = <37152>;

		qcom,msm-cpudai-tdm-group-num-ports = <1>;

		qcom,msm-cpudai-tdm-group-port-id = <36896>;

		qcom,msm-cpudai-tdm-clk-rate = <1536000>;

		pinctrl-names = "default", "sleep";

		dai_tert_tdm_rx_0: qcom,msm-dai-q6-tdm-tert-rx-0 {

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

			qcom,msm-cpudai-tdm-dev-id = <36896>;

			qcom,msm-cpudai-tdm-sync-mode = <1>;

			qcom,msm-cpudai-tdm-sync-src = <1>;

			qcom,msm-cpudai-tdm-data-out = <0>;

			qcom,msm-cpudai-tdm-invert-sync = <1>;

			qcom,msm-cpudai-tdm-data-delay = <1>;

			qcom,msm-cpudai-tdm-data-align = <0>;

		};

	};



	qcom,msm-dai-tdm-tert-tx {

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

		qcom,msm-cpudai-tdm-group-id = <37153>;

		qcom,msm-cpudai-tdm-group-num-ports = <1>;

		qcom,msm-cpudai-tdm-group-port-id = <36897 >;

		qcom,msm-cpudai-tdm-clk-rate = <1536000>;

		pinctrl-names = "default", "sleep";

		dai_tert_tdm_tx_0: qcom,msm-dai-q6-tdm-tert-tx-0 {

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

			qcom,msm-cpudai-tdm-dev-id = <36897 >;

			qcom,msm-cpudai-tdm-sync-mode = <1>;

			qcom,msm-cpudai-tdm-sync-src = <1>;

			qcom,msm-cpudai-tdm-data-out = <0>;

			qcom,msm-cpudai-tdm-invert-sync = <1>;

			qcom,msm-cpudai-tdm-data-delay = <1>;

			qcom,msm-cpudai-tdm-data-align = <0>;

		};

	};

};

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

+8 −4
Original line number Diff line number Diff line
@@ -94,7 +94,8 @@ 
				<&incall_record_tx>, <&incall_music_rx>,

				<&incall_music_2_rx>, <&sb_5_rx>, <&sb_6_rx>,

				<&sb_7_rx>, <&sb_7_tx>, <&sb_8_tx>,

				<&usb_audio_rx>, <&usb_audio_tx>;

				<&usb_audio_rx>, <&usb_audio_tx>,

				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>;

		asoc-cpu-names = "msm-dai-q6-hdmi.8", "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -112,7 +113,8 @@ 
				"msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394",

				"msm-dai-q6-dev.16396", "msm-dai-q6-dev.16398",

				"msm-dai-q6-dev.16399", "msm-dai-q6-dev.16401",

				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673";

				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673",

				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897";

		asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;

		asoc-codec-names = "msm-stub-codec.1",

				   "msm-ext-disp-audio-codec-rx";
@@ -184,7 +186,8 @@ 
				<&incall_record_tx>, <&incall_music_rx>,

				<&incall_music_2_rx>, <&sb_5_rx>, <&sb_6_rx>,

				<&sb_7_rx>, <&sb_7_tx>, <&sb_8_tx>,

				<&usb_audio_rx>, <&usb_audio_tx>;

				<&usb_audio_rx>, <&usb_audio_tx>,

				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>;

		asoc-cpu-names = "msm-dai-q6-hdmi.8",  "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -202,7 +205,8 @@ 
				"msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394",

				"msm-dai-q6-dev.16396", "msm-dai-q6-dev.16398",

				"msm-dai-q6-dev.16399", "msm-dai-q6-dev.16401",

				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673";

				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673",

				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897";

		asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;

		asoc-codec-names = "msm-stub-codec.1",

				   "msm-ext-disp-audio-codec-rx";