arm64: dts: qcom: add audio capture support

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
index c27202e296d5962d6f2d6c9a58098de5577bc315..1f43b15f1ade7fc19eef62a0d320978bcf3e03db 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
@@ -373,7 +373,7 @@
                pinctrl-names = "default","sleep";
                pinctrl-0 = <&adv7533_int_active &adv7533_switch_active>;
                pinctrl-1 = <&adv7533_int_suspend &adv7533_switch_suspend>;
-               #sound-dai-cells = <0>;
+               #sound-dai-cells = <1>;
 
                port {
                        adv_in: endpoint {
@@ -420,11 +420,33 @@
        */
 &sound {
        status = "okay";
-       pinctrl-0 = <&cdc_pdm_lines_act &ext_sec_tlmm_lines_act &ext_mclk_tlmm_lines_act>;
-       pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus &ext_mclk_tlmm_lines_sus>;
+       pinctrl-0 = <&cdc_pdm_lines_act &ext_sec_tlmm_lines_act &ext_mclk_tlmm_lines_act &cdc_dmic_lines_act>;
+       pinctrl-1 = <&cdc_pdm_lines_sus &ext_sec_tlmm_lines_sus &ext_mclk_tlmm_lines_sus &cdc_dmic_lines_sus>;
        pinctrl-names = "default", "sleep";
        qcom,model = "DB410c";
+       qcom,audio-routing =
+               "MIC BIAS External", "Handset Mic",
+               "MIC BIAS Internal2", "Headset Mic",
+               "MIC BIAS External", "Secondary Mic",
+               "AMIC1", "MIC BIAS External",
+               "AMIC2", "MIC BIAS Internal2",
+               "AMIC3", "MIC BIAS External",
+               "DMIC1", "MIC BIAS Internal1",
+               "MIC BIAS Internal1", "Digital Mic1",
+               "DMIC2", "MIC BIAS Internal1",
+               "MIC BIAS Internal1", "Digital Mic2";
 
+       /* External Primary or External Secondary -ADV7533 HDMI */
+       external-dai-link@0 {
+               link-name = "ADV7533";
+
+               cpu { /* QUAT */
+                       sound-dai = <&lpass MI2S_QUATERNARY>;
+               };
+               codec {
+                       sound-dai = <&adv_bridge 0>;
+               };
+       };
 
        internal-codec-playback-dai-link@0 {            /* I2S - Internal codec */
                link-name = "WCD";
@@ -436,17 +458,16 @@
                };
        };
 
-       /* External Primary or External Secondary -ADV7533 HDMI */
-       external-dai-link@0 {
-               link-name = "ADV7533";
-
-               cpu { /* QUAT */
-                       sound-dai = <&lpass MI2S_QUATERNARY>;
+       internal-codec-capture-dai-link@0 {             /* I2S - Internal codec */
+               link-name = "WCD-Capture";
+               cpu { /* PRIMARY */
+                       sound-dai = <&lpass MI2S_TERTIARY>;
                };
                codec {
-                       sound-dai = <&adv_bridge 0>;
+                       sound-dai = <&wcd_codec 1>;
                };
        };
+
 };
 
 /* default regulators required for mezzanine boards */

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index a7024deaf3a1b14dfec10c1ad7da6d8d363dfb26..36c094da050f47ccfc606a0f5ff70e00e1ba0894 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -690,7 +690,7 @@
                                 <&gcc GCC_ULTAUDIO_PCNOC_SWAY_CLK>,
                                 <&gcc GCC_ULTAUDIO_LPAIF_PRI_I2S_CLK>,
                                 <&gcc GCC_ULTAUDIO_LPAIF_SEC_I2S_CLK>,
-                                <&gcc GCC_ULTAUDIO_LPAIF_AUX_I2S_CLK>,
+                                <&gcc GCC_ULTAUDIO_LPAIF_SEC_I2S_CLK>,
                                 <&gcc GCC_ULTAUDIO_LPAIF_AUX_I2S_CLK>;
 
                        clock-names = "ahbix-clk",

diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi
index fcc9303da10056441852a54a0acaffa70535485c..113ccb3fa8868abe1fd142ec8dadd9c039729e7c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi
@@ -221,9 +221,10 @@
                wcd_codec: codec@f000 {
                        compatible = "qcom,apq8016-wcd-codec";
                        reg = <0xf000 0x200>;
-                       #sound-dai-cells = <0>;
+                       #sound-dai-cells = <1>;
                        vddio-supply = <&pm8916_l5>;
                        vdd-pa-supply = <&pm8916_s4>;
+                       vdd-mic-bias-supply = <&pm8916_l13>;
                };
        };
 };