From 04e9ad0a953805fb45d17b00101bdeb1c05c6c00 Mon Sep 17 00:00:00 2001 From: Yuhui Zhao Date: Sun, 25 Jun 2023 17:24:55 +0800 Subject: [PATCH] dts: crow: update swr-port-mapping for crow Update swr-port-mapping prop for crow. since the version of swr is V1.7. Add dmic 1 support for crow-wcd9395 variant. Change-Id: I5ac5105490bec3e012d17bcb27552cb09ad92534 --- crow-audio-idp-wcd9395-wcd-dmic.dtsi | 2 ++ crow-audio-overlay.dtsi | 34 ++++++++++++---------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/crow-audio-idp-wcd9395-wcd-dmic.dtsi b/crow-audio-idp-wcd9395-wcd-dmic.dtsi index 67fff4ac..12cec429 100644 --- a/crow-audio-idp-wcd9395-wcd-dmic.dtsi +++ b/crow-audio-idp-wcd9395-wcd-dmic.dtsi @@ -29,6 +29,8 @@ "VA AMIC2", "VA MIC BIAS2", "DMIC0", "Digital Mic0", "DMIC0", "MIC BIAS3", + "DMIC1", "Digital Mic1", + "DMIC1", "MIC BIAS3", "DMIC2", "Digital Mic2", "DMIC2", "MIC BIAS1", "DMIC3", "Digital Mic3", diff --git a/crow-audio-overlay.dtsi b/crow-audio-overlay.dtsi index 83da443e..2e7071fa 100644 --- a/crow-audio-overlay.dtsi +++ b/crow-audio-overlay.dtsi @@ -54,15 +54,14 @@ ; interrupt-names = "swr_master_irq", "swr_wake_irq"; qcom,swr-wakeup-required = <1>; - qcom,swr-num-ports = <5>; - qcom,swr-port-mapping = <1 SWRM_TX_PCM_OUT 0x3>, - <2 SWRM_TX1_CH1 0x1>, <2 SWRM_TX1_CH2 0x2>, - <2 SWRM_TX1_CH3 0x4>, <2 SWRM_TX1_CH4 0x8>, - <3 SWRM_TX2_CH1 0x1>, <3 SWRM_TX2_CH2 0x2>, - <3 SWRM_TX2_CH3 0x4>, <3 SWRM_TX2_CH4 0x8>, - <4 SWRM_TX3_CH1 0x1>, <4 SWRM_TX3_CH2 0x2>, - <4 SWRM_TX3_CH3 0x4>, <4 SWRM_TX3_CH4 0x8>, - <5 SWRM_TX_PCM_IN 0x3>; + qcom,swr-num-ports = <3>; + qcom,swr-port-mapping = <1 SWRM_TX1_CH1 0x1>, + <1 SWRM_TX1_CH2 0x2>, + <1 SWRM_TX1_CH3 0x4>, <1 SWRM_TX1_CH4 0x8>, + <2 SWRM_TX2_CH1 0x1>, <2 SWRM_TX2_CH2 0x2>, + <2 SWRM_TX2_CH3 0x4>, <2 SWRM_TX2_CH4 0x8>, + <3 SWRM_TX3_CH1 0x1>, <3 SWRM_TX3_CH2 0x2>, + <3 SWRM_TX3_CH3 0x4>, <3 SWRM_TX3_CH4 0x8>; qcom,swr-num-dev = <5>; qcom,swr-clock-stop-mode0 = <1>; qcom,swr-mstr-irq-wakeup-capable = <1>; @@ -150,15 +149,12 @@ swrm-io-base = <0x3210000 0x0>; interrupts = ; interrupt-names = "swr_master_irq"; - qcom,swr-num-ports = <12>; + qcom,swr-num-ports = <6>; qcom,swr-port-mapping = <1 HPH_L 0x1>, - <1 HPH_R 0x2>, <2 CLSH 0x3>, + <1 HPH_R 0x2>, <2 CLSH 0x1>, <3 COMP_L 0x1>, <3 COMP_R 0x2>, <4 LO 0x1>, <5 DSD_L 0x1>, - <5 DSD_R 0x2>, <6 PCM_OUT1 0x01>, - <7 GPPO 0x03>, <8 HAPT 0x03>, - <9 HIFI 0x03>, <10 HPTH 0x03>, - <11 CMPT 0x03>, <12 IPCM 0x03>; + <5 DSD_R 0x2>, <6 PCM_OUT1 0x01>; qcom,swr-num-dev = <2>; qcom,swr-clock-stop-mode0 = <1>; swr_haptics: swr_haptics@f0170220 { @@ -206,15 +202,13 @@ swrm-io-base = <0x3250000 0x0>; interrupts = ; interrupt-names = "swr_master_irq"; - qcom,swr-num-ports = <13>; + qcom,swr-num-ports = <8>; qcom,swr-clock-stop-mode0 = <1>; qcom,swr-port-mapping = <1 SPKR_L 0x1>, <2 SPKR_L_COMP 0xF>, <3 SPKR_L_BOOST 0x3>, <4 SPKR_R 0x1>, <5 SPKR_R_COMP 0xF>, - <6 SPKR_R_BOOST 0x3>, <7 PBR 0x3>, - <8 SPKR_HAPT 0x3>, <9 OCPM 0x3>, - <10 SPKR_L_VI 0x3>, <11 SPKR_R_VI 0x3>, - <12 SPKR_IPCM 0x3>, <13 CPS 0x3>; + <6 SPKR_R_BOOST 0x3>, <7 SPKR_L_VI 0x3>, + <8 SPKR_R_VI 0x3>; qcom,swr-num-dev = <2>; qcom,dynamic-port-map-supported = <0>; wsa884x_0220: wsa884x@02170220 {