ARM: dts: msm: support msm-pcm-dtmf on msm8996 adsp/cdp

Add msm-pcm-dtmf DAI for sound cards on msm8996
automotive ADP/CDP platforms.

Change-Id: I5015536ec7293892bb1da4547b2ea90b20d93123
Signed-off-by: Timothy Sham <tsham@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 80901dd..111266c 100644 (file)
--- a/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi
+++ b/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -699,14 +699,14 @@
                asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
                                <&loopback>, <&compress>, <&hostless>,
                                <&afe>, <&lsm>, <&routing>, <&pcmnoirq>,
-                               <&loopback1>;
+                               <&loopback1>, <&pcm_dtmf>;
                asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",
                                "msm-pcm-dsp.2", "msm-voip-dsp",
                                "msm-pcm-voice", "msm-pcm-loopback",
                                "msm-compress-dsp", "msm-pcm-hostless",
                                "msm-pcm-afe", "msm-lsm-client",
                                "msm-pcm-routing", "msm-pcm-dsp-noirq",
-                               "msm-pcm-loopback.1";
+                               "msm-pcm-loopback.1", "msm-pcm-dtmf";
                asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,
                                <&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,
                                <&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -769,6 +769,10 @@
                qcom,msm-pcm-loopback-low-latency;
        };
 
+       pcm_dtmf: qcom,msm-pcm-dtmf {
+               compatible = "qcom,msm-pcm-dtmf";
+       };
+
        qcom,msm-dai-mi2s {
                dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {
                        qcom,msm-mi2s-rx-lines = <2>;

diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
index 2ab2d00..692dd58 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
@@ -1054,14 +1054,14 @@
                asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
                                <&loopback>, <&compress>, <&hostless>,
                                <&afe>, <&lsm>, <&routing>, <&pcmnoirq>,
-                               <&loopback1>;
+                               <&loopback1>, <&pcm_dtmf>;
                asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",
                                "msm-pcm-dsp.2", "msm-voip-dsp",
                                "msm-pcm-voice", "msm-pcm-loopback",
                                "msm-compress-dsp", "msm-pcm-hostless",
                                "msm-pcm-afe", "msm-lsm-client",
                                "msm-pcm-routing", "msm-pcm-dsp-noirq",
-                               "msm-pcm-loopback.1";
+                               "msm-pcm-loopback.1", "msm-pcm-dtmf";
                asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,
                                <&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,
                                <&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -1157,9 +1157,8 @@
                qcom,msm-pcm-loopback-low-latency;
        };
 
-       loopback1: qcom,msm-pcm-loopback-low-latency {
-               compatible = "qcom,msm-pcm-loopback";
-               qcom,msm-pcm-loopback-low-latency;
+       pcm_dtmf: qcom,msm-pcm-dtmf {
+               compatible = "qcom,msm-pcm-dtmf";
        };
 
        qcom,msm-dai-mi2s {

diff --git a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
index 2702ddb..8e109b5 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
@@ -905,14 +905,14 @@
                asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
                                <&loopback>, <&compress>, <&hostless>,
                                <&afe>, <&lsm>, <&routing>, <&pcmnoirq>,
-                               <&loopback1>;
+                               <&loopback1>, <&pcm_dtmf>;
                asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",
                                "msm-pcm-dsp.2", "msm-voip-dsp",
                                "msm-pcm-voice", "msm-pcm-loopback",
                                "msm-compress-dsp", "msm-pcm-hostless",
                                "msm-pcm-afe", "msm-lsm-client",
                                "msm-pcm-routing", "msm-pcm-dsp-noirq",
-                               "msm-pcm-loopback.1";
+                               "msm-pcm-loopback.1", "msm-pcm-dtmf";
                asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,
                                <&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,
                                <&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -977,6 +977,10 @@
                qcom,msm-pcm-loopback-low-latency;
        };
 
+       pcm_dtmf: qcom,msm-pcm-dtmf {
+               compatible = "qcom,msm-pcm-dtmf";
+       };
+
        usb_vbus_vreg: usb_vbus_vreg {
                compatible = "regulator-fixed";
                regulator-name = "usb_vbus_vreg";

diff --git a/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi
index d8770a7..c0969a6 100644 (file)
--- a/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -524,14 +524,14 @@
                asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
                                <&loopback>, <&compress>, <&hostless>,
                                <&afe>, <&lsm>, <&routing>, <&pcmnoirq>,
-                               <&loopback1>;
+                               <&loopback1>, <&pcm_dtmf>;
                asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",
                                "msm-pcm-dsp.2", "msm-voip-dsp",
                                "msm-pcm-voice", "msm-pcm-loopback",
                                "msm-compress-dsp", "msm-pcm-hostless",
                                "msm-pcm-afe", "msm-lsm-client",
                                "msm-pcm-routing", "msm-pcm-dsp-noirq",
-                               "msm-pcm-loopback.1";
+                               "msm-pcm-loopback.1", "msm-pcm-dtmf";
                asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,
                                <&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,
                                <&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -588,6 +588,10 @@
                qcom,msm-pcm-loopback-low-latency;
        };
 
+       pcm_dtmf: qcom,msm-pcm-dtmf {
+               compatible = "qcom,msm-pcm-dtmf";
+       };
+
        qcom,msm-dai-mi2s {
                dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {
                        qcom,msm-mi2s-rx-lines = <2>;

diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-audio-common.dtsi b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-audio-common.dtsi
index 97ab78b..3928836 100644 (file)
--- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-audio-common.dtsi
+++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-audio-common.dtsi
@@ -18,14 +18,14 @@
                asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
                        <&loopback>, <&compress>, <&hostless>,
                        <&afe>, <&lsm>, <&routing>, <&pcmnoirq>,
-                       <&loopback1>;
+                       <&loopback1>, <&pcm_dtmf>;
                asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",
                        "msm-pcm-dsp.2", "msm-voip-dsp",
                        "msm-pcm-voice", "msm-pcm-loopback",
                        "msm-compress-dsp", "msm-pcm-hostless",
                        "msm-pcm-afe", "msm-lsm-client",
                        "msm-pcm-routing", "msm-pcm-dsp-noirq",
-                       "msm-pcm-loopback.1";
+                       "msm-pcm-loopback.1", "msm-pcm-dtmf";
                asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,
                        <&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,
                        <&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -119,6 +119,10 @@
                qcom,destroy-cvd;
        };
 
+       pcm_dtmf: qcom,msm-pcm-dtmf {
+               compatible = "qcom,msm-pcm-dtmf";
+       };
+
        stub_codec: qcom,msm-stub-codec {
                compatible = "qcom,msm-stub-codec";
        };