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

Commit 6ec0fac4 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add support for senary tdm/auxpcm"

parents 10a438f4 7d1bc84b

qcom/kona-audio-overlay.dtsi

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


&kona_snd {

	qcom,model = "kona-mtp-snd-card";

	qcom,msm-mi2s-master = <1>, <1>, <1>;

	qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>;

	qcom,wcn-bt = <1>;

	qcom,ext-disp-audio-rx = <1>;

	qcom,audio-routing =

qcom/kona-audio.dtsi

+7 −3
Original line number Diff line number Diff line
@@ -82,9 +82,10 @@ 
		asoc-cpu = <&dai_dp>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_mi2s4>, <&dai_mi2s5>, <&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&dai_sen_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,

				<&afe_proxy_tx>, <&incall_record_rx>,

				<&incall_record_tx>, <&incall_music_rx>,
@@ -96,6 +97,7 @@ 
				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,

				<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>,

				<&dai_quin_tdm_rx_0>, <&dai_quin_tdm_tx_0>,

				<&dai_sen_tdm_rx_0>, <&dai_sen_tdm_tx_0>,

				<&wsa_cdc_dma_0_rx>, <&wsa_cdc_dma_0_tx>,

				<&wsa_cdc_dma_1_rx>, <&wsa_cdc_dma_1_tx>,

				<&wsa_cdc_dma_2_tx>,
@@ -112,10 +114,11 @@ 
		asoc-cpu-names = "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",

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

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

				"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",

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

				"msm-dai-q6-auxpcm.6", "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",
@@ -127,6 +130,7 @@ 
				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897",

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

				"msm-dai-q6-tdm.36928", "msm-dai-q6-tdm.36929",

				"msm-dai-q6-tdm.36944", "msm-dai-q6-tdm.36945",

				"msm-dai-cdc-dma-dev.45056",

				"msm-dai-cdc-dma-dev.45057",

				"msm-dai-cdc-dma-dev.45058",

qcom/msm-audio-lpass.dtsi

+52 −0
Original line number Diff line number Diff line
@@ -424,6 +424,20 @@ 
		qcom,msm-cpudai-afe-clk-ver = <2>;

	};



	dai_sen_auxpcm: qcom,msm-sen-auxpcm {

		compatible = "qcom,msm-auxpcm-dev";

		qcom,msm-cpudai-auxpcm-mode = <0>, <0>;

		qcom,msm-cpudai-auxpcm-sync = <1>, <1>;

		qcom,msm-cpudai-auxpcm-frame = <5>, <4>;

		qcom,msm-cpudai-auxpcm-quant = <2>, <2>;

		qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;

		qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;

		qcom,msm-cpudai-auxpcm-data = <0>, <0>;

		qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;

		qcom,msm-auxpcm-interface = "senary";

		qcom,msm-cpudai-afe-clk-ver = <2>;

	};



	hdmi_dba: qcom,msm-hdmi-dba-codec-rx {

		compatible = "qcom,msm-hdmi-dba-codec-rx";

		qcom,dba-bridge-chip = "adv7533";
@@ -625,6 +639,44 @@ 
		};

	};



	tdm_sen_rx: qcom,msm-dai-tdm-sen-rx {

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

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

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

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

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

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

		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>;

		dai_sen_tdm_rx_0: qcom,msm-dai-q6-tdm-sen-rx-0 {

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

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

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

		};

	};



	tdm_sen_tx: qcom,msm-dai-tdm-sen-tx {

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

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

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

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

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

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

		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>;

		dai_sen_tdm_tx_0: qcom,msm-dai-q6-tdm-sen-tx-0 {

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

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

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

		};

	};



	dai_pri_spdif_rx: qcom,msm-dai-q6-spdif-pri-rx {

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

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