From 402927035529c82614f76c52e67cf856a6db1f05 Mon Sep 17 00:00:00 2001 From: sarath varma ganapathiraju Date: Fri, 26 May 2023 15:43:14 +0530 Subject: [PATCH] audio-dt: update audio dtsi for crow. update crow lpi with i2s gpio pins. update audio routing for crow wcd-dmic variants. Change-Id: Ie763ae7695e710df9c2088a9ac137e9d7e970b72 --- crow-audio-atp.dtsi | 41 ------------- crow-audio-idp-wcd9395-dmic.dtsi | 45 ++++++++++++++ crow-audio-idp-wcd9395-wcd-dmic.dtsi | 92 +++++++++++----------------- crow-audio-overlay.dtsi | 2 +- crow-audio.dtsi | 1 - crow-lpi.dtsi | 80 ++++++++++++------------ 6 files changed, 122 insertions(+), 139 deletions(-) diff --git a/crow-audio-atp.dtsi b/crow-audio-atp.dtsi index db81ca8c..bcddde3e 100644 --- a/crow-audio-atp.dtsi +++ b/crow-audio-atp.dtsi @@ -1,42 +1 @@ #include "crow-audio-idp.dtsi" - -&swr_haptics { - status = "disabled"; -}; - -&swr0 { - qcom,swr-num-dev = <2>; - - wsa884x_0220: wsa884x@02170220 { - status = "disabled"; - }; - - wsa884x_0221: wsa884x@02170221 { - status = "disabled"; - }; - - wsa883x_0221: wsa883x@02170221 { - status = "disabled"; - }; - - wsa883x_0222: wsa883x@02170222 { - status = "disabled"; - }; -}; - -&kalama_snd { - asoc-codec = <&stub_codec>, <&lpass_cdc>; - asoc-codec-names = "msm-stub-codec.1", "lpass-cdc"; -}; - -&wcd937x_codec { - status = "disabled"; -}; - -&wcd937x_tx_slave { - status = "disabled"; -}; - -&wcd937x_rx_slave { - status = "disabled"; -}; diff --git a/crow-audio-idp-wcd9395-dmic.dtsi b/crow-audio-idp-wcd9395-dmic.dtsi index 69939b97..a86130e6 100644 --- a/crow-audio-idp-wcd9395-dmic.dtsi +++ b/crow-audio-idp-wcd9395-dmic.dtsi @@ -22,6 +22,51 @@ &kalama_snd { qcom,model = "crow-idp-wcd9395-dmic-snd-card"; + qcom,audio-routing = + "AMIC2", "Analog Mic2", + "AMIC2", "MIC BIAS2", + "VA AMIC2", "Analog Mic2", + "VA AMIC2", "VA MIC BIAS2", + "TX DMIC0", "Digital Mic0", + "TX DMIC0", "MIC BIAS3", + "TX DMIC1", "Digital Mic1", + "TX DMIC1", "MIC BIAS3", + "TX DMIC2", "Digital Mic2", + "TX DMIC2", "MIC BIAS1", + "TX DMIC3", "Digital Mic3", + "TX DMIC3", "MIC BIAS1", + "IN1_HPHL", "HPHL_OUT", + "IN2_HPHR", "HPHR_OUT", + "IN3_EAR", "AUX_OUT", + "WSA SRC0_INP", "SRC0", + "WSA_TX DEC0_INP", "TX DEC0 MUX", + "WSA_TX DEC1_INP", "TX DEC1 MUX", + "RX_TX DEC0_INP", "TX DEC0 MUX", + "RX_TX DEC1_INP", "TX DEC1 MUX", + "RX_TX DEC2_INP", "TX DEC2 MUX", + "RX_TX DEC3_INP", "TX DEC3 MUX", + "SpkrLeft IN", "WSA_SPK1 OUT", + "SpkrRight IN", "WSA_SPK2 OUT", + "TX SWR_INPUT", "WCD_TX_OUTPUT", + "VA SWR_INPUT", "VA_SWR_CLK", + "VA SWR_INPUT", "WCD_TX_OUTPUT", + "VA_AIF1 CAP", "VA_SWR_CLK", + "VA_AIF2 CAP", "VA_SWR_CLK", + "VA_AIF3 CAP", "VA_SWR_CLK", + "VA DMIC0", "Digital Mic0", + "VA DMIC1", "Digital Mic1", + "VA DMIC2", "Digital Mic2", + "VA DMIC3", "Digital Mic3", + "VA DMIC0", "VA MIC BIAS3", + "VA DMIC1", "VA MIC BIAS3", + "VA DMIC2", "VA MIC BIAS1", + "VA DMIC3", "VA MIC BIAS1"; + asoc-codec = <&stub_codec>, <&lpass_cdc>, + <&wcd939x_codec>, <&wsa884x_0220>, + <&wsa884x_0221>; + asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", + "wcd939x_codec", "wsa-codec1", + "wsa-codec2"; wcd939x-i2c-handle = <&wcd_usbss>; qcom,pri-mi2s-gpios = <&fm_i2s0_gpios>; }; diff --git a/crow-audio-idp-wcd9395-wcd-dmic.dtsi b/crow-audio-idp-wcd9395-wcd-dmic.dtsi index 39558a68..67fff4ac 100644 --- a/crow-audio-idp-wcd9395-wcd-dmic.dtsi +++ b/crow-audio-idp-wcd9395-wcd-dmic.dtsi @@ -22,62 +22,42 @@ &kalama_snd { qcom,model = "crow-idp-wcd9395-wcd-dmic-snd-card"; - - qcom,audio-routing = - "AMIC1", "Analog Mic1", - "AMIC1", "MIC BIAS1", - "AMIC2", "Analog Mic2", - "AMIC2", "MIC BIAS2", - "AMIC3", "Analog Mic3", - "AMIC3", "MIC BIAS3", - "AMIC4", "Analog Mic4", - "AMIC4", "MIC BIAS3", - "VA AMIC1", "Analog Mic1", - "VA AMIC1", "VA MIC BIAS1", - "VA AMIC2", "Analog Mic2", - "VA AMIC2", "VA MIC BIAS2", - "VA AMIC3", "Analog Mic3", - "VA AMIC3", "VA MIC BIAS3", - "VA AMIC4", "Analog Mic4", - "VA AMIC4", "VA MIC BIAS3", - "DMIC0", "Digital Mic0", - "DMIC0", "MIC BIAS3", - "DMIC1", "Digital Mic1", - "DMIC1", "MIC BIAS3", - "DMIC2", "Digital Mic2", - "DMIC2", "MIC BIAS1", - "DMIC3", "Digital Mic3", - "DMIC3", "MIC BIAS1", - "DMIC4", "Digital Mic4", - "DMIC4", "MIC BIAS1", - "IN1_HPHL", "HPHL_OUT", - "IN2_HPHR", "HPHR_OUT", - "IN3_EAR", "AUX_OUT", - "HAP_IN", "PCM_OUT", - "WSA SRC0_INP", "SRC0", - "WSA_TX DEC0_INP", "TX DEC0 MUX", - "WSA_TX DEC1_INP", "TX DEC1 MUX", - "RX_TX DEC0_INP", "TX DEC0 MUX", - "RX_TX DEC1_INP", "TX DEC1 MUX", - "RX_TX DEC2_INP", "TX DEC2 MUX", - "RX_TX DEC3_INP", "TX DEC3 MUX", - "SpkrLeft IN", "WSA_SPK1 OUT", - "SpkrRight IN", "WSA_SPK2 OUT", - "TX SWR_INPUT", "WCD_TX_OUTPUT", - "VA SWR_INPUT", "VA_SWR_CLK", - "VA SWR_INPUT", "WCD_TX_OUTPUT", - "VA_AIF1 CAP", "VA_SWR_CLK", - "VA_AIF2 CAP", "VA_SWR_CLK", - "VA_AIF3 CAP", "VA_SWR_CLK", - "VA DMIC0", "Digital Mic0", - "VA DMIC1", "Digital Mic1", - "VA DMIC2", "Digital Mic2", - "VA DMIC3", "Digital Mic3", - "VA DMIC0", "VA MIC BIAS3", - "VA DMIC1", "VA MIC BIAS3", - "VA DMIC2", "VA MIC BIAS1", - "VA DMIC3", "VA MIC BIAS1"; - asoc-codec = <&stub_codec>, <&lpass_cdc>, + qcom,audio-routing = + "AMIC2", "Analog Mic2", + "AMIC2", "MIC BIAS2", + "VA AMIC2", "Analog Mic2", + "VA AMIC2", "VA MIC BIAS2", + "DMIC0", "Digital Mic0", + "DMIC0", "MIC BIAS3", + "DMIC2", "Digital Mic2", + "DMIC2", "MIC BIAS1", + "DMIC3", "Digital Mic3", + "DMIC3", "MIC BIAS1", + "IN1_HPHL", "HPHL_OUT", + "IN2_HPHR", "HPHR_OUT", + "IN3_EAR", "AUX_OUT", + "WSA SRC0_INP", "SRC0", + "WSA_TX DEC0_INP", "TX DEC0 MUX", + "WSA_TX DEC1_INP", "TX DEC1 MUX", + "RX_TX DEC0_INP", "TX DEC0 MUX", + "RX_TX DEC1_INP", "TX DEC1 MUX", + "RX_TX DEC2_INP", "TX DEC2 MUX", + "RX_TX DEC3_INP", "TX DEC3 MUX", + "SpkrLeft IN", "WSA_SPK1 OUT", + "SpkrRight IN", "WSA_SPK2 OUT", + "TX SWR_INPUT", "WCD_TX_OUTPUT", + "VA SWR_INPUT", "VA_SWR_CLK", + "VA SWR_INPUT", "WCD_TX_OUTPUT", + "VA_AIF1 CAP", "VA_SWR_CLK", + "VA_AIF2 CAP", "VA_SWR_CLK", + "VA_AIF3 CAP", "VA_SWR_CLK", + "VA DMIC0", "Digital Mic0", + "VA DMIC2", "Digital Mic2", + "VA DMIC3", "Digital Mic3", + "VA DMIC0", "VA MIC BIAS3", + "VA DMIC2", "VA MIC BIAS1", + "VA DMIC3", "VA MIC BIAS1"; + asoc-codec = <&stub_codec>, <&lpass_cdc>, <&wcd939x_codec>, <&wsa884x_0220>, <&wsa884x_0221>; asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", "wcd939x_codec", "wsa-codec1", "wsa-codec2"; diff --git a/crow-audio-overlay.dtsi b/crow-audio-overlay.dtsi index 4b2f4d91..ed5595c3 100644 --- a/crow-audio-overlay.dtsi +++ b/crow-audio-overlay.dtsi @@ -6,7 +6,7 @@ &lpass_cdc { qcom,num-macros = <4>; - qcom,lpass-cdc-version = <7>; + qcom,lpass-cdc-version = <6>; #address-cells = <1>; #size-cells = <1>; lpass-cdc-clk-rsc-mngr { diff --git a/crow-audio.dtsi b/crow-audio.dtsi index 28ae6f65..304b33b6 100644 --- a/crow-audio.dtsi +++ b/crow-audio.dtsi @@ -136,7 +136,6 @@ kalama_snd: sound { compatible = "qcom,kalama-asoc-snd"; qcom,mi2s-audio-intf = <1>; - qcom,auxpcm-audio-intf = <1>; qcom,wcn-bt = <0>; qcom,ext-disp-audio-rx = <0>; qcom,afe-rxtx-lb = <0>; diff --git a/crow-lpi.dtsi b/crow-lpi.dtsi index dac7a14a..af864f23 100644 --- a/crow-lpi.dtsi +++ b/crow-lpi.dtsi @@ -303,7 +303,7 @@ lpi_i2s2_sck_sleep: lpi_i2s2_sck_sleep { mux { pins = "gpio10"; - function = "func1"; + function = "func2"; }; config { @@ -317,7 +317,7 @@ lpi_i2s2_sck_active: lpi_i2s2_sck_active { mux { pins = "gpio10"; - function = "func1"; + function = "func2"; }; config { @@ -333,7 +333,7 @@ lpi_i2s2_ws_sleep: lpi_i2s2_ws_sleep { mux { pins = "gpio11"; - function = "func1"; + function = "func2"; }; config { @@ -347,7 +347,7 @@ lpi_i2s2_ws_active: lpi_i2s2_ws_active { mux { pins = "gpio11"; - function = "func1"; + function = "func2"; }; config { @@ -362,12 +362,12 @@ lpi_i2s2_sd0 { lpi_i2s2_sd0_sleep: lpi_i2s2_sd0_sleep { mux { - pins = "gpio15"; - function = "func1"; + pins = "gpio12"; + function = "func2"; }; config { - pins = "gpio15"; + pins = "gpio12"; drive-strength = <2>; /* 2 mA */ bias-pull-down; /* PULL DOWN */ input-enable; @@ -376,12 +376,12 @@ lpi_i2s2_sd0_active: lpi_i2s2_sd0_active { mux { - pins = "gpio15"; - function = "func1"; + pins = "gpio12"; + function = "func2"; }; config { - pins = "gpio15"; + pins = "gpio12"; drive-strength = <8>; /* 8 mA */ bias-disable; /* NO PULL */ output-high; @@ -392,12 +392,12 @@ lpi_i2s2_sd1 { lpi_i2s2_sd1_sleep: lpi_i2s2_sd1_sleep { mux { - pins = "gpio16"; - function = "func1"; + pins = "gpio13"; + function = "func2"; }; config { - pins = "gpio16"; + pins = "gpio13"; drive-strength = <2>; /* 2 mA */ bias-pull-down; /* PULL DOWN */ input-enable; @@ -406,12 +406,12 @@ lpi_i2s2_sd1_active: lpi_i2s2_sd1_active { mux { - pins = "gpio16"; - function = "func1"; + pins = "gpio13"; + function = "func2"; }; config { - pins = "gpio16"; + pins = "gpio13"; drive-strength = <8>; /* 8 mA */ bias-disable; /* NO PULL */ output-high; @@ -422,12 +422,12 @@ lpi_i2s3_sck { lpi_i2s3_sck_sleep: lpi_i2s3_sck_sleep { mux { - pins = "gpio12"; - function = "func2"; + pins = "gpio19"; + function = "func1"; }; config { - pins = "gpio12"; + pins = "gpio19"; drive-strength = <2>; /* 2 mA */ bias-pull-down; /* PULL DOWN */ input-enable; @@ -436,12 +436,12 @@ lpi_i2s3_sck_active: lpi_i2s3_sck_active { mux { - pins = "gpio12"; - function = "func2"; + pins = "gpio19"; + function = "func1"; }; config { - pins = "gpio12"; + pins = "gpio19"; drive-strength = <8>; /* 8 mA */ bias-disable; /* NO PULL */ output-high; @@ -452,12 +452,12 @@ lpi_i2s3_ws { lpi_i2s3_ws_sleep: lpi_i2s3_ws_sleep { mux { - pins = "gpio13"; - function = "func2"; + pins = "gpio20"; + function = "func1"; }; config { - pins = "gpio13"; + pins = "gpio20"; drive-strength = <2>; /* 2 mA */ bias-pull-down; /* PULL DOWN */ input-enable; @@ -466,12 +466,12 @@ lpi_i2s3_ws_active: lpi_i2s3_ws_active { mux { - pins = "gpio13"; - function = "func2"; + pins = "gpio20"; + function = "func1"; }; config { - pins = "gpio13"; + pins = "gpio20"; drive-strength = <8>; /* 8 mA */ bias-disable; /* NO PULL */ output-high; @@ -482,12 +482,12 @@ lpi_i2s3_sd0 { lpi_i2s3_sd0_sleep: lpi_i2s3_sd0_sleep { mux { - pins = "gpio17"; - function = "func2"; + pins = "gpio21"; + function = "func1"; }; config { - pins = "gpio17"; + pins = "gpio21"; drive-strength = <2>; /* 2 mA */ bias-pull-down; /* PULL DOWN */ input-enable; @@ -496,12 +496,12 @@ lpi_i2s3_sd0_active: lpi_i2s3_sd0_active { mux { - pins = "gpio17"; - function = "func2"; + pins = "gpio21"; + function = "func1"; }; config { - pins = "gpio17"; + pins = "gpio21"; drive-strength = <8>; /* 8 mA */ bias-disable; /* NO PULL */ output-high; @@ -512,12 +512,12 @@ lpi_i2s3_sd1 { lpi_i2s3_sd1_sleep: lpi_i2s3_sd1_sleep { mux { - pins = "gpio18"; - function = "func2"; + pins = "gpio22"; + function = "func1"; }; config { - pins = "gpio18"; + pins = "gpio22"; drive-strength = <2>; /* 2 mA */ bias-pull-down; /* PULL DOWN */ input-enable; @@ -526,12 +526,12 @@ lpi_i2s3_sd1_active: lpi_i2s3_sd1_active { mux { - pins = "gpio18"; - function = "func2"; + pins = "gpio22"; + function = "func1"; }; config { - pins = "gpio18"; + pins = "gpio22"; drive-strength = <8>; /* 8 mA */ bias-disable; /* NO PULL */ output-high;