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

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

Merge "ARM: dts: msm: config primary tdm on auto platform"

parents 6cfcbfe6 31bc179e

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

+12 −12
Original line number Diff line number Diff line
@@ -25,11 +25,17 @@ 
		qcom,msm-cpudai-tdm-group-port-id = <36864 36866 36868 36870>;

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

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

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

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

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

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

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

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

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

		qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;

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

		pinctrl-0 = <&pri_tdm_clk_active &pri_tdm_sync_active

				&pri_tdm_din_active &pri_tdm_dout_active>;

		pinctrl-1 = <&pri_tdm_clk_sleep &pri_tdm_sync_sleep

				&pri_tdm_din_sleep &pri_tdm_dout_sleep>;

		dai_pri_tdm_rx_0: qcom,msm-dai-q6-tdm-pri-rx-0 {

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

			qcom,msm-cpudai-tdm-dev-id = <36864>;
@@ -62,11 +68,12 @@ 
		qcom,msm-cpudai-tdm-group-port-id = <36865 36867 36869 36871>;

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

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

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

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

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

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

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

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

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

		qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;

		dai_pri_tdm_tx_0: qcom,msm-dai-q6-tdm-pri-tx-0 {

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

			qcom,msm-cpudai-tdm-dev-id = <36865>;
@@ -455,14 +462,6 @@ 
			qcom,msm-cpudai-tdm-data-align = <0>;

		};

	};



	dai_pri_auxpcm: qcom,msm-pri-auxpcm {

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

		pinctrl-0 = <&pri_aux_pcm_clk_active &pri_aux_pcm_sync_active

			     &pri_aux_pcm_din_active &pri_aux_pcm_dout_active>;

		pinctrl-1 = <&pri_aux_pcm_clk_sleep &pri_aux_pcm_sync_sleep

			     &pri_aux_pcm_din_sleep &pri_aux_pcm_dout_sleep>;

	};

};



&audio_apr {
@@ -487,6 +486,7 @@ 
		qcom,auxpcm-audio-intf;

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



		qcom,pri-tdm-gpios = <&tdm_pri_rx>;

		qcom,sec-tdm-gpios = <&tdm_sec_rx>;

		qcom,tert-tdm-gpios = <&tdm_tert_rx>;

		qcom,quat-tdm-gpios = <&tdm_quat_rx>;