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: Honghao Liu <honghaol@codeaurora.org>
This commit is contained in:
Honghao Liu 2017-03-09 17:43:38 -05:00 committed by Gerrit - the friendly Code Review server
parent 1ff96f8075
commit 0467b50811
4 changed files with 126 additions and 48 deletions

View file

@ -646,12 +646,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",
@ -663,12 +664,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";
};
@ -702,6 +704,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>;

View file

@ -881,12 +881,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",
@ -898,12 +899,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,9 +948,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 {

View file

@ -650,12 +650,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",
@ -667,12 +668,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";
};
@ -722,6 +724,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>;

View file

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