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

Commit 6e3c381a 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 interfaces on msm8996 MTP"

parents 67e9dcf1 1e78a007

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

+2 −0
Original line number Diff line number Diff line
@@ -1408,6 +1408,8 @@ Optional properties: 
- qcom,wsa-max-devs : Maximum number of WSA881x devices present in the target

- qcom,wsa-devs : List of phandles for all possible WSA881x devices supported for the target

- qcom,wsa-aux-dev-prefix : Name prefix with Left/Right configuration for WSA881x device

- qcom,tdm-audio-intf : Boolean. This property is used to specify whether TDM interface

			is supported or not to the machine driver.



Example:

arch/arm/boot/dts/qcom/msm8996-mtp.dtsi

+90 −0
Original line number Diff line number Diff line
@@ -726,6 +726,7 @@ 


	sound-9335 {

		qcom,model = "msm8996-tasha-mtp-snd-card";

		qcom,tdm-audio-intf;



		qcom,audio-routing =

			"AIF4 VI", "MCLK",
@@ -760,6 +761,66 @@ 


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

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>,

				<&dai_hdmi>, <&dai_mi2s>,

				<&sb_0_rx>, <&sb_0_tx>,

				<&sb_1_rx>, <&sb_1_tx>,

				<&sb_2_rx>, <&sb_2_tx>,

				<&sb_3_rx>, <&sb_3_tx>,

				<&sb_4_rx>, <&sb_4_tx>,

				<&sb_5_tx>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,

				<&incall_music_rx>, <&incall_music2_rx>,

				<&sb_5_rx>, <&sb_6_rx>,

				<&usb_audio_rx>, <&usb_audio_tx>,

				<&dai_pri_tdm_tx_0>, <&dai_pri_tdm_tx_1>,

				<&dai_pri_tdm_tx_2>, <&dai_pri_tdm_tx_3>,

				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_rx_1>,

				<&dai_pri_tdm_rx_2>, <&dai_pri_tdm_rx_3>,

				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_rx_1>,

				<&dai_sec_tdm_rx_2>, <&dai_sec_tdm_rx_3>,

				<&dai_sec_tdm_tx_0>, <&dai_sec_tdm_tx_1>,

				<&dai_sec_tdm_tx_2>, <&dai_sec_tdm_tx_3>,

				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_rx_1>,

				<&dai_tert_tdm_rx_2>, <&dai_tert_tdm_rx_3>,

				<&dai_tert_tdm_tx_0>, <&dai_tert_tdm_tx_1>,

				<&dai_tert_tdm_tx_2>, <&dai_tert_tdm_tx_3>,

				<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_rx_1>,

				<&dai_quat_tdm_rx_2>, <&dai_quat_tdm_rx_3>,

				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,

				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.2",

				"msm-dai-q6-dev.16384", "msm-dai-q6-dev.16385",

				"msm-dai-q6-dev.16386", "msm-dai-q6-dev.16387",

				"msm-dai-q6-dev.16388", "msm-dai-q6-dev.16389",

				"msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391",

				"msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393",

				"msm-dai-q6-dev.16395",

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",

				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",

				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770",

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

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

				"msm-dai-q6-tdm.36865", "msm-dai-q6-tdm.36867",

				"msm-dai-q6-tdm.36869", "msm-dai-q6-tdm.36871",

				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36866",

				"msm-dai-q6-tdm.36868", "msm-dai-q6-tdm.36870",

				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36882",

				"msm-dai-q6-tdm.36884", "msm-dai-q6-tdm.36886",

				"msm-dai-q6-tdm.36881", "msm-dai-q6-tdm.36883",

				"msm-dai-q6-tdm.36885", "msm-dai-q6-tdm.36887",

				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36898",

				"msm-dai-q6-tdm.36900", "msm-dai-q6-tdm.36902",

				"msm-dai-q6-tdm.36897", "msm-dai-q6-tdm.36899",

				"msm-dai-q6-tdm.36901", "msm-dai-q6-tdm.36903",

				"msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36914",

				"msm-dai-q6-tdm.36916", "msm-dai-q6-tdm.36918",

				"msm-dai-q6-tdm.36913", "msm-dai-q6-tdm.36915",

				"msm-dai-q6-tdm.36917", "msm-dai-q6-tdm.36919";

		qcom,hph-en1-gpio = <&pmi8994_gpios 10 0>;

		qcom,hph-en0-gpio = <&pm8994_gpios 13 0>;

		qcom,us-euro-gpios = <&pm8994_mpps 2 0>;
@@ -769,6 +830,35 @@ 
		qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",

					  "SpkrLeft", "SpkrRight";

	};

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

		qcom,msm-cpudai-tdm-clk-internal = <1>;

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

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

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

		pinctrl-0 = <&tert_tdm_dout_active>;

		pinctrl-1 = <&tert_tdm_dout_sleep>;

	};

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

		qcom,msm-cpudai-tdm-clk-internal = <1>;

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

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

	};

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

		qcom,msm-cpudai-tdm-clk-internal = <1>;

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

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

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

		pinctrl-0 = <&quat_tdm_active &quat_tdm_dout_active>;

		pinctrl-1 = <&quat_tdm_sleep &quat_tdm_dout_sleep>;

	};

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

		qcom,msm-cpudai-tdm-clk-internal = <1>;

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

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

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

		pinctrl-0 = <&quat_tdm_din_active>;

		pinctrl-1 = <&quat_tdm_din_sleep>;

	};

};



&pm8994_gpios {

arch/arm/boot/dts/qcom/msm8996.dtsi

+13 −2
Original line number Diff line number Diff line
@@ -3100,7 +3100,8 @@ 
				<&afe_pcm_tx>, <&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,

				<&incall_music_rx>, <&incall_music2_rx>,

				<&sb_5_rx>, <&sb_6_rx>;

				<&sb_5_rx>, <&sb_6_rx>,

				<&usb_audio_rx>, <&usb_audio_tx>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.2",

				"msm-dai-q6-dev.16384", "msm-dai-q6-dev.16385",
@@ -3113,7 +3114,8 @@ 
				"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",

				"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",

				"msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394",

				"msm-dai-q6-dev.16396";

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

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

		asoc-codec = <&stub_codec>;

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

	};
@@ -3329,6 +3331,15 @@ 
			qcom,msm-dai-q6-dev-id = <16396>;

		};



		usb_audio_rx: qcom,msm-dai-q6-usb-audio-rx {

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

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

		};



		usb_audio_tx: qcom,msm-dai-q6-usb-audio-tx {

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

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

		};

	};



	dai_pri_auxpcm: qcom,msm-pri-auxpcm {

sound/soc/msm/msm8996.c

+6397 −1475

File changed.

Preview size limit exceeded, changes collapsed.