ARM: dts: msm: Support Primary TDM Interface for msm8996

Support Primary TDM Interface for automotive and use optional property
clk-attribute couple_no to mimic PCM mode.

CRs-Fixed: 2083327
Change-Id: I2ef32eac5ecd4740f0985a77241952abca4ebc52
Signed-off-by: Cong Tang <congt@codeaurora.org>

diff --git a/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi b/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi
index 4081a21..db33594 100644 (file)
--- a/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi
+++ b/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi
@@ -713,6 +713,10 @@
                                <&afe_proxy_rx>, <&afe_proxy_tx>,
                                <&incall_record_rx>, <&incall_record_tx>,
                                <&incall_music_rx>, <&incall_music2_rx>,
+                               <&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_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>,
@@ -731,6 +735,10 @@
                                "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-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.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",

diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
index 9dbec1e..2dc5c91 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
@@ -1016,6 +1016,10 @@
                                <&afe_proxy_rx>, <&afe_proxy_tx>,
                                <&incall_record_rx>, <&incall_record_tx>,
                                <&incall_music_rx>, <&incall_music2_rx>,
+                               <&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_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>,
@@ -1034,6 +1038,10 @@
                                "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-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.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",

diff --git a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
index ad14bfd..1d5e303 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
@@ -838,6 +838,10 @@
                                <&afe_proxy_rx>, <&afe_proxy_tx>,
                                <&incall_record_rx>, <&incall_record_tx>,
                                <&incall_music_rx>, <&incall_music2_rx>,
+                               <&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_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>,
@@ -856,6 +860,10 @@
                                "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-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.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",

diff --git a/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi
index d3ea512..c8898ec 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi
@@ -538,6 +538,10 @@
                                <&afe_proxy_rx>, <&afe_proxy_tx>,
                                <&incall_record_rx>, <&incall_record_tx>,
                                <&incall_music_rx>, <&incall_music2_rx>,
+                               <&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_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>,
@@ -556,6 +560,10 @@
                                "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-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.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",

diff --git a/arch/arm/boot/dts/qcom/msm8996.dtsi b/arch/arm/boot/dts/qcom/msm8996.dtsi
index dcd884b..c1a6d1f 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996.dtsi
@@ -3355,6 +3355,82 @@
                };
        };
 
+       qcom,msm-dai-tdm-pri-rx {
+               compatible = "qcom,msm-dai-tdm";
+               qcom,msm-cpudai-tdm-group-id = <37120>;
+               qcom,msm-cpudai-tdm-group-num-ports = <4>;
+               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 = <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 = <1>;
+               qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
+               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>;
+                       qcom,msm-cpudai-tdm-data-align = <0>;
+               };
+
+               dai_pri_tdm_rx_1: qcom,msm-dai-q6-tdm-pri-rx-1 {
+                       compatible = "qcom,msm-dai-q6-tdm";
+                       qcom,msm-cpudai-tdm-dev-id = <36866>;
+                       qcom,msm-cpudai-tdm-data-align = <0>;
+               };
+
+               dai_pri_tdm_rx_2: qcom,msm-dai-q6-tdm-pri-rx-2 {
+                       compatible = "qcom,msm-dai-q6-tdm";
+                       qcom,msm-cpudai-tdm-dev-id = <36868>;
+                       qcom,msm-cpudai-tdm-data-align = <0>;
+               };
+
+               dai_pri_tdm_rx_3: qcom,msm-dai-q6-tdm-pri-rx-3 {
+                       compatible = "qcom,msm-dai-q6-tdm";
+                       qcom,msm-cpudai-tdm-dev-id = <36870>;
+                       qcom,msm-cpudai-tdm-data-align = <0>;
+               };
+       };
+
+       qcom,msm-dai-tdm-pri-tx {
+               compatible = "qcom,msm-dai-tdm";
+               qcom,msm-cpudai-tdm-group-id = <37121>;
+               qcom,msm-cpudai-tdm-group-num-ports = <4>;
+               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 = <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 = <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>;
+                       qcom,msm-cpudai-tdm-data-align = <0>;
+               };
+
+               dai_pri_tdm_tx_1: qcom,msm-dai-q6-tdm-pri-tx-1 {
+                       compatible = "qcom,msm-dai-q6-tdm";
+                       qcom,msm-cpudai-tdm-dev-id = <36867>;
+                       qcom,msm-cpudai-tdm-data-align = <0>;
+               };
+
+               dai_pri_tdm_tx_2: qcom,msm-dai-q6-tdm-pri-tx-2 {
+                       compatible = "qcom,msm-dai-q6-tdm";
+                       qcom,msm-cpudai-tdm-dev-id = <36869>;
+                       qcom,msm-cpudai-tdm-data-align = <0>;
+               };
+
+               dai_pri_tdm_tx_3: qcom,msm-dai-q6-tdm-pri-tx-3 {
+                       compatible = "qcom,msm-dai-q6-tdm";
+                       qcom,msm-cpudai-tdm-dev-id = <36871>;
+                       qcom,msm-cpudai-tdm-data-align = <0>;
+               };
+       };
+
        qcom,msm-dai-tdm-sec-tx {
                compatible = "qcom,msm-dai-tdm";
                qcom,msm-cpudai-tdm-group-id = <37137>;

diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dts b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dts
index b108f7d..30b36c0 100644 (file)
--- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dts
+++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dts
@@ -85,6 +85,10 @@
                        <&afe_proxy_rx>, <&afe_proxy_tx>,
                        <&incall_record_rx>, <&incall_record_tx>,
                        <&incall_music_rx>, <&incall_music2_rx>,
+                       <&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_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>,
@@ -103,6 +107,10 @@
                        "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-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.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",