From 9856a0a55af6f259e53688b673769cc79b6be18a Mon Sep 17 00:00:00 2001 From: Mohammad Rafi Shaik Date: Mon, 27 May 2024 22:13:17 +0530 Subject: [PATCH] codecs: qcom-lpass/tx-macro: Move TX1 MODE ctrl to The tx-macro is a common interface for WCD937x and wcd938x and also the TX1 MODE setting is not applicable for WCD937x codec. The TX1 MODE mixer controller is derived in WCD938x codec driver, So move TX1 MODE mixer control to wcd938x. Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/421 Signed-off-by: Mohammad Rafi Shaik Signed-off-by: Jaroslav Kysela --- ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf | 1 - ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicEnableSeq.conf | 1 - ucm2/codecs/wcd938x/HeadphoneMicDisableSeq.conf | 1 + ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf b/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf index 97b2762..9cee13f 100644 --- a/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf +++ b/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf @@ -1,5 +1,4 @@ DisableSequence [ cset "name='TX SMIC MUX0' ZERO" cset "name='TX_AIF1_CAP Mixer DEC0' 0" - cset "name='TX1 MODE' ADC_INVALID" ] diff --git a/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicEnableSeq.conf b/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicEnableSeq.conf index 631c6e2..0eacfb5 100644 --- a/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicEnableSeq.conf +++ b/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicEnableSeq.conf @@ -2,6 +2,5 @@ EnableSequence [ cset "name='TX DEC0 MUX' SWR_MIC" cset "name='TX SMIC MUX0' ADC1" cset "name='TX_AIF1_CAP Mixer DEC0' 1" - cset "name='TX1 MODE' ADC_NORMAL" cset "name='TX_DEC0 Volume' 110" ] diff --git a/ucm2/codecs/wcd938x/HeadphoneMicDisableSeq.conf b/ucm2/codecs/wcd938x/HeadphoneMicDisableSeq.conf index 498b8b3..9021b92 100644 --- a/ucm2/codecs/wcd938x/HeadphoneMicDisableSeq.conf +++ b/ucm2/codecs/wcd938x/HeadphoneMicDisableSeq.conf @@ -1,4 +1,5 @@ DisableSequence [ cset "name='ADC2_MIXER Switch' 0" cset "name='ADC2 Switch' 0" + set "name='TX1 MODE' ADC_INVALID" ] diff --git a/ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf b/ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf index 8ea2472..f3a7807 100644 --- a/ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf +++ b/ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf @@ -3,4 +3,5 @@ EnableSequence [ cset "name='HDR12 MUX' NO_HDR12" cset "name='ADC2 MUX' INP2" cset "name='ADC2 Switch' 1" + set "name='TX1 MODE' ADC_NORMAL" ] -- 2.47.1