From: Hans de Goede <hdegoede@redhat.com>
To: Jaroslav Kysela <perex@perex.cz>
Cc: Hans de Goede <hdegoede@redhat.com>,
alsa-devel@alsa-project.org,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Bard Liao <bard.liao@intel.com>
Subject: [PATCH alsa-ucm-conf v2 3/7] codecs/rt5640: Cleanup: Move 'SPK MIX' setup to main EnableSequene
Date: Mon, 8 Mar 2021 23:05:50 +0100 [thread overview]
Message-ID: <20210308220554.76111-4-hdegoede@redhat.com> (raw)
In-Reply-To: <20210308220554.76111-1-hdegoede@redhat.com>
Cleanup: no functional changes intended.
Do the 'SPK MIXL' / 'SPK MIXR' setup only once from the main
EnableSequene, like we do for the 'OUT MIXL' / 'OUT MIXR' setup
used by the headphones already.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
ucm2/codecs/rt5640/EnableSeq.conf | 6 ++++--
ucm2/codecs/rt5640/MonoSpeaker.conf | 2 --
ucm2/codecs/rt5640/Speaker.conf | 2 --
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ucm2/codecs/rt5640/EnableSeq.conf b/ucm2/codecs/rt5640/EnableSeq.conf
index 5dc7092..4a355a5 100644
--- a/ucm2/codecs/rt5640/EnableSeq.conf
+++ b/ucm2/codecs/rt5640/EnableSeq.conf
@@ -6,8 +6,10 @@ EnableSequence [
cset "name='Stereo DAC MIXR DAC R1 Switch' on"
cset "name='Stereo DAC MIXL DAC L2 Switch' on"
cset "name='Stereo DAC MIXR DAC R2 Switch' on"
- cset "name='OUT MIXL DAC L1 Switch' on"
- cset "name='OUT MIXR DAC R1 Switch' on"
+ cset "name='OUT MIXL DAC L1 Switch' on"
+ cset "name='OUT MIXR DAC R1 Switch' on"
+ cset "name='SPK MIXL DAC L1 Switch' on"
+ cset "name='SPK MIXR DAC R1 Switch' on"
# uncomment for loopback mic->speakers
# cset "name='SPOL MIX BST1 Switch' on"
diff --git a/ucm2/codecs/rt5640/MonoSpeaker.conf b/ucm2/codecs/rt5640/MonoSpeaker.conf
index 5035c8d..654edc3 100644
--- a/ucm2/codecs/rt5640/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5640/MonoSpeaker.conf
@@ -6,8 +6,6 @@ SectionDevice."Speaker" {
]
EnableSequence [
- cset "name='SPK MIXL DAC L1 Switch' on"
- cset "name='SPK MIXR DAC R1 Switch' on"
cset "name='SPOL MIX SPKVOL L Switch' on"
# for mono speaker we apply left on right
# cset "name='SPOR MIX SPKVOL R Switch' on"
diff --git a/ucm2/codecs/rt5640/Speaker.conf b/ucm2/codecs/rt5640/Speaker.conf
index fd74994..3264cc3 100644
--- a/ucm2/codecs/rt5640/Speaker.conf
+++ b/ucm2/codecs/rt5640/Speaker.conf
@@ -6,8 +6,6 @@ SectionDevice."Speaker" {
]
EnableSequence [
- cset "name='SPK MIXL DAC L1 Switch' on"
- cset "name='SPK MIXR DAC R1 Switch' on"
cset "name='SPOL MIX SPKVOL L Switch' on"
cset "name='SPOR MIX SPKVOL R Switch' on"
# undo MonoSpeaker mixing of right channel to left speaker
--
2.30.1
next prev parent reply other threads:[~2021-03-08 22:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 22:05 [PATCH alsa-ucm-conf v2 0/7] codecs/rt5640: Cleanup + HW volume control support Hans de Goede
2021-03-08 22:05 ` [PATCH alsa-ucm-conf v2 1/7] codecs/rt5640: Cleanup: unify Stereo / Mono ADC handling Hans de Goede
2021-03-08 22:05 ` [PATCH alsa-ucm-conf v2 2/7] codecs/rt5640: Cleanup: Initially disable all inputs and outputs Hans de Goede
2021-03-08 22:05 ` Hans de Goede [this message]
2021-03-08 22:05 ` [PATCH alsa-ucm-conf v2 4/7] codecs/rt5640: Drop bogus 'DIG MIXL DAC L2 Switch' setting Hans de Goede
2021-03-08 22:05 ` [PATCH alsa-ucm-conf v2 5/7] codecs/rt5640: Unify capture volume for AIF1 and AIF2 recording paths Hans de Goede
2021-03-08 22:05 ` [PATCH alsa-ucm-conf v2 6/7] codecs/rt5640: Add hardware volume-control support Hans de Goede
2021-03-08 22:05 ` [PATCH alsa-ucm-conf v2 7/7] codecs/rt5640: Specify Playback/CaptureMasterElem for HW volume-control Hans de Goede
2021-03-13 12:10 ` Hans de Goede
2021-03-13 16:05 ` Jaroslav Kysela
2021-03-10 10:24 ` [PATCH alsa-ucm-conf v2 0/7] codecs/rt5640: Cleanup + HW volume control support Jaroslav Kysela
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210308220554.76111-4-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=alsa-devel@alsa-project.org \
--cc=bard.liao@intel.com \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).