From 8a5e4541144e8688591a2d6d185c6aec147d6921 Mon Sep 17 00:00:00 2001 From: Yuhui Zhao Date: Wed, 4 Dec 2024 15:01:56 +0800 Subject: [PATCH] ARM: dts: msm: correct wsa channel of kera qrd Correct wsa channel of kera qrd. it should be left channel. Change-Id: I8b784e77b2db45963d0e27a47a51fc145febb52b Signed-off-by: Yuhui Zhao --- kera-audio-cdp.dtsi | 12 +++++------- kera-audio-mtp.dtsi | 4 ++-- kera-audio-overlay.dtsi | 2 +- kera-audio-qrd.dtsi | 8 ++++---- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/kera-audio-cdp.dtsi b/kera-audio-cdp.dtsi index 3bba2f68..cfbe8973 100644 --- a/kera-audio-cdp.dtsi +++ b/kera-audio-cdp.dtsi @@ -98,7 +98,7 @@ "TX DMIC3", "MIC BIAS1", "IN1_HPHL", "HPHL_OUT", "IN2_HPHR", "HPHR_OUT", - "IN3_EAR", "AUX_OUT", + "IN3_AUX", "AUX_OUT", "WSA SRC0_INP", "SRC0", "WSA_TX DEC0_INP", "TX DEC0 MUX", "WSA_TX DEC1_INP", "TX DEC1 MUX", @@ -108,9 +108,7 @@ "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", @@ -118,10 +116,10 @@ "VA DMIC1", "Digital Mic1", "VA DMIC2", "Digital Mic2", "VA DMIC3", "Digital Mic3", - "VA DMIC0", "VA MIC BIAS1", - "VA DMIC1", "VA MIC BIAS1", - "VA DMIC2", "VA MIC BIAS3", - "VA DMIC3", "VA MIC BIAS3"; + "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>, <&wcd9378_codec>, <&wsa884x_0220>, <&wsa884x_0221>; diff --git a/kera-audio-mtp.dtsi b/kera-audio-mtp.dtsi index 067fe728..16da7bbb 100644 --- a/kera-audio-mtp.dtsi +++ b/kera-audio-mtp.dtsi @@ -118,7 +118,7 @@ "TX DMIC3", "MIC BIAS1", "IN1_HPHL", "HPHL_OUT", "IN2_HPHR", "HPHR_OUT", - "IN3_AUX", "AUX_OUT", + "IN3_EAR", "AUX_OUT", "WSA SRC0_INP", "SRC0", "WSA_TX DEC0_INP", "TX DEC0 MUX", "WSA_TX DEC1_INP", "TX DEC1 MUX", @@ -129,8 +129,8 @@ "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 SWR_INPUT", "VA_SWR_CLK", "VA_AIF1 CAP", "VA_SWR_CLK", "VA_AIF2 CAP", "VA_SWR_CLK", "VA_AIF3 CAP", "VA_SWR_CLK", diff --git a/kera-audio-overlay.dtsi b/kera-audio-overlay.dtsi index ea7d0954..0c8b8f90 100644 --- a/kera-audio-overlay.dtsi +++ b/kera-audio-overlay.dtsi @@ -458,7 +458,7 @@ "RX_TX DEC1_INP", "TX DEC1 MUX", "RX_TX DEC2_INP", "TX DEC2 MUX", "RX_TX DEC3_INP", "TX DEC3 MUX", - "SpkrRight IN", "WSA_SPK2 OUT", + "SpkrLeft IN", "WSA_SPK1 OUT", "VA SWR_INPUT", "VA_SWR_CLK", "VA_AIF1 CAP", "VA_SWR_CLK", "VA_AIF2 CAP", "VA_SWR_CLK", diff --git a/kera-audio-qrd.dtsi b/kera-audio-qrd.dtsi index a19f90b0..c5b51dd4 100644 --- a/kera-audio-qrd.dtsi +++ b/kera-audio-qrd.dtsi @@ -31,11 +31,11 @@ &swr0 { wsa884x_0220: wsa884x@02170220 { - status = "disabled"; + status = "okay"; }; wsa884x_0221: wsa884x@02170221 { - status = "okay"; + status = "disabled"; }; }; @@ -79,8 +79,8 @@ qcom,model = "kera-qrd-snd-card"; swr-haptics-unsupported; asoc-codec = <&stub_codec>, <&lpass_cdc>, - <&wcd9378_codec>, <&wsa884x_0221>; + <&wcd9378_codec>, <&wsa884x_0220>; asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", - "wcd9378_codec", "wsa-codec2"; + "wcd9378_codec", "wsa-codec1"; qcom,wsa-max-devs = <1>; };