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

Commit 6f0cb013 authored by Honghao Liu's avatar Honghao Liu
Browse files

ARM: dts: msm: support TERT_TDM_RX_4 DAI on msm8996 adp/cdp 



Add TERT_TDM_RX_4 DAI in the TDM TERT RX entry and automotive
sound card entry for msm8996 automotive ADP/CDP platforms.

CRs-fixed: 2018097
Change-Id: Icbb2e9622fb58995fd063965a108d3e5fbaf42ea
Signed-off-by: default avatarHonghao Liu <honghaol@codeaurora.org>
parent 3ad7caee

arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi

+33 −12
Original line number Diff line number Diff line
@@ -691,12 +691,13 @@ 
				<&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>;

				<&dai_tert_tdm_rx_4>, <&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.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -708,12 +709,13 @@ 
				"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";

				"msm-dai-q6-tdm.36904", "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";

		asoc-codec = <&stub_codec>;

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

	};
@@ -749,6 +751,25 @@ 
		};

	};



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

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

		qcom,msm-cpudai-tdm-group-port-id = <36896 36898 36900

							36902 36904>;

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

		pinctrl-0 = <&tert_tdm_dout_active>;

		pinctrl-1 = <&tert_tdm_dout_sleep>;

		dai_tert_tdm_rx_4: qcom,msm-dai-q6-tdm-tert-rx-4 {

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

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

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

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

			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-align = <0>;

		};

	};



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

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

		pinctrl-0 = <&quat_tdm_dout_active>;

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+27 −12
Original line number Diff line number Diff line
@@ -1004,12 +1004,13 @@ 
				<&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>;

				<&dai_tert_tdm_rx_4>, <&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.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -1021,12 +1022,13 @@ 
				"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";

				"msm-dai-q6-tdm.36904", "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";

		asoc-codec = <&stub_codec>;

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

	};
@@ -1068,9 +1070,22 @@ 
	};



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

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

		qcom,msm-cpudai-tdm-group-port-id = <36896 36898 36900

							36902 36904>;

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

		pinctrl-0 = <&tert_tdm_dout_active>;

		pinctrl-1 = <&tert_tdm_dout_sleep>;

		dai_tert_tdm_rx_4: qcom,msm-dai-q6-tdm-tert-rx-4 {

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

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

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

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

			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-align = <0>;

		};

	};



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

arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi

+33 −12
Original line number Diff line number Diff line
@@ -874,12 +874,13 @@ 
				<&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>;

				<&dai_tert_tdm_rx_4>, <&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.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -891,12 +892,13 @@ 
				"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";

				"msm-dai-q6-tdm.36904", "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";

		asoc-codec = <&stub_codec>;

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

	};
@@ -946,6 +948,25 @@ 
		};

	};



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

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

		qcom,msm-cpudai-tdm-group-port-id = <36896 36898 36900

							36902 36904>;

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

		pinctrl-0 = <&tert_tdm_dout_active>;

		pinctrl-1 = <&tert_tdm_dout_sleep>;

		dai_tert_tdm_rx_4: qcom,msm-dai-q6-tdm-tert-rx-4 {

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

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

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

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

			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-align = <0>;

		};

	};



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

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

		pinctrl-0 = <&quat_tdm_dout_active>;

arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi

+33 −12
Original line number Diff line number Diff line
@@ -542,12 +542,13 @@ 
				<&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>;

				<&dai_tert_tdm_rx_4>, <&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.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -559,12 +560,13 @@ 
				"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";

				"msm-dai-q6-tdm.36904", "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";

		asoc-codec = <&stub_codec>;

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

	};
@@ -592,6 +594,25 @@ 
		};

	};



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

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

		qcom,msm-cpudai-tdm-group-port-id = <36896 36898 36900

							36902 36904>;

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

		pinctrl-0 = <&tert_tdm_dout_active>;

		pinctrl-1 = <&tert_tdm_dout_sleep>;

		dai_tert_tdm_rx_4: qcom,msm-dai-q6-tdm-tert-rx-4 {

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

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

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

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

			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-align = <0>;

		};

	};



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

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

		pinctrl-0 = <&quat_tdm_dout_active>;