diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2016-02-04 13:23:04 +0000 |
|---|---|---|
| committer | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2016-02-05 08:13:00 +0000 |
| commit | d76fd34be892fead095cfc3515a0d8f20c598ef7 (patch) | |
| tree | da3e935b61b9e2cc9e1adf4ec55ba2595ae97977 | |
| parent | adfd7619184eb734c07b7fc9d6f6e68260ce9ab3 (diff) | |
arm64: dts: qcom: add audio capture support
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
| -rw-r--r-- | arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 41 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/pm8916.dtsi | 3 |
3 files changed, 34 insertions, 12 deletions
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi index c27202e296d59..1f43b15f1ade7 100644 --- 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 a7024deaf3a1b..36c094da050f4 100644 --- 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 fcc9303da1005..113ccb3fa8868 100644 --- 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>; }; }; }; |