From e63b9850dbb8fdbe24de956c2df22f09bfce29db Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Tue, 20 Jul 2021 09:35:44 +0800 Subject: [PATCH] audio: dts: update widget connection for SVA usecase When enabling SVA usecase, micbias should be switched to PULL_UP mode to reduce power consumption. Update widget connection to enable PULL_UP for sva micbias. Change-Id: I3c43460402d0c3d7593c463cca6edc749dde40aa --- waipio-audio-cdp.dtsi | 36 ++++++++++++++++++++---------------- waipio-audio-overlay.dtsi | 16 ++++++++-------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/waipio-audio-cdp.dtsi b/waipio-audio-cdp.dtsi index b4fc1b9a..c32bb177 100644 --- a/waipio-audio-cdp.dtsi +++ b/waipio-audio-cdp.dtsi @@ -52,21 +52,21 @@ "VA AMIC5", "Analog Mic5", "VA AMIC5", "VA MIC BIAS4", "TX DMIC0", "Digital Mic0", - "Digital Mic0", "MIC BIAS3", + "TX DMIC0", "MIC BIAS3", "TX DMIC1", "Digital Mic1", - "Digital Mic1", "MIC BIAS3", + "TX DMIC1", "MIC BIAS3", "TX DMIC2", "Digital Mic2", - "Digital Mic2", "MIC BIAS1", + "TX DMIC2", "MIC BIAS1", "TX DMIC3", "Digital Mic3", - "Digital Mic3", "MIC BIAS1", + "TX DMIC3", "MIC BIAS1", "TX DMIC4", "Digital Mic4", - "Digital Mic4", "MIC BIAS4", + "TX DMIC4", "MIC BIAS4", "TX DMIC5", "Digital Mic5", - "Digital Mic5", "MIC BIAS4", + "TX DMIC5", "MIC BIAS4", "TX DMIC6", "Digital Mic6", - "Digital Mic6", "MIC BIAS3", + "TX DMIC6", "MIC BIAS3", "TX DMIC7", "Digital Mic7", - "Digital Mic7", "MIC BIAS3", + "TX DMIC7", "MIC BIAS3", "IN1_HPHL", "HPHL_OUT", "IN2_HPHR", "HPHR_OUT", "IN3_AUX", "AUX_OUT", @@ -90,14 +90,18 @@ "VA DMIC1", "Digital Mic1", "VA DMIC2", "Digital Mic2", "VA DMIC3", "Digital Mic3", - "Digital Mic0", "VA MIC BIAS3", - "Digital Mic1", "VA MIC BIAS3", - "Digital Mic2", "VA MIC BIAS1", - "Digital Mic3", "VA MIC BIAS1", - "Digital Mic4", "VA MIC BIAS4", - "Digital Mic5", "VA MIC BIAS4", - "Digital Mic6", "VA MIC BIAS3", - "Digital Mic7", "VA MIC BIAS3"; + "VA DMIC4", "Digital Mic4", + "VA DMIC5", "Digital Mic5", + "VA DMIC6", "Digital Mic6", + "VA DMIC7", "Digital Mic7", + "VA DMIC0", "VA MIC BIAS3", + "VA DMIC1", "VA MIC BIAS3", + "VA DMIC2", "VA MIC BIAS1", + "VA DMIC3", "VA MIC BIAS1", + "VA DMIC4", "VA MIC BIAS4", + "VA DMIC5", "VA MIC BIAS4", + "VA DMIC6", "VA MIC BIAS3", + "VA DMIC7", "VA MIC BIAS3"; qcom,cdc-dmic67-gpios = <&cdc_dmic67_gpios>; asoc-codec = <&stub_codec>, <&lpass_cdc>, <&wcd938x_codec>, <&swr_haptics>, diff --git a/waipio-audio-overlay.dtsi b/waipio-audio-overlay.dtsi index 507e269c..7be3d6ca 100644 --- a/waipio-audio-overlay.dtsi +++ b/waipio-audio-overlay.dtsi @@ -370,13 +370,13 @@ "VA AMIC5", "Analog Mic5", "VA AMIC5", "VA MIC BIAS4", "TX DMIC0", "Digital Mic0", - "Digital Mic0", "MIC BIAS3", + "TX DMIC0", "MIC BIAS3", "TX DMIC1", "Digital Mic1", - "Digital Mic1", "MIC BIAS3", + "TX DMIC1", "MIC BIAS3", "TX DMIC2", "Digital Mic2", - "Digital Mic2", "MIC BIAS1", + "TX DMIC2", "MIC BIAS1", "TX DMIC3", "Digital Mic3", - "Digital Mic3", "MIC BIAS1", + "TX DMIC3", "MIC BIAS1", "IN1_HPHL", "HPHL_OUT", "IN2_HPHR", "HPHR_OUT", "IN3_AUX", "AUX_OUT", @@ -400,10 +400,10 @@ "VA DMIC1", "Digital Mic1", "VA DMIC2", "Digital Mic2", "VA DMIC3", "Digital Mic3", - "Digital Mic0", "VA MIC BIAS3", - "Digital Mic1", "VA MIC BIAS3", - "Digital Mic2", "VA MIC BIAS1", - "Digital Mic3", "VA MIC BIAS1"; + "VA DMIC0", "VA MIC BIAS3", + "VA DMIC1", "VA MIC BIAS3", + "VA DMIC2", "VA MIC BIAS1", + "VA DMIC3", "VA MIC BIAS1"; qcom,msm-mbhc-usbc-audio-supported = <0>; qcom,msm-mbhc-hphl-swh = <1>; qcom,msm-mbhc-gnd-swh = <1>;