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 <quic_mohs@quicinc.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf b/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf
index 97b2762ca297bf3ea51abf128e982ebc1eeafb8a..9cee13f425084499bc08f5570668b93ba59e9fb5 100644 (file)
--- 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 631c6e2879d7c7496bb00f06d4d5936565c426c3..0eacfb5a18d8d07c794b3c635b7ae01e3aa1fae1 100644 (file)
--- 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 498b8b38a9a9830306997ca3ecb58f3cd242882d..9021b92cf4aadbd9f07d29f0295f148990616821 100644 (file)
--- 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 8ea2472b87f19b4d76fcd44a5198dfdca6a8b4ef..f3a780718ea2a28924fcc02d5acf470a16070ab5 100644 (file)
--- 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"
 ]