From: Hans de Goede <hdegoede@redhat.com>
To: alsa-devel@alsa-project.org
Cc: Takashi Iwai <tiwai@suse.de>, Hans de Goede <hdegoede@redhat.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [PATCH 07/14] conf/ucm: bytcr-rt5651: Use generic SSP enable + disable sequence
Date: Fri, 20 Jul 2018 09:27:34 +0200 [thread overview]
Message-ID: <20180720072741.4632-8-hdegoede@redhat.com> (raw)
In-Reply-To: <20180720072741.4632-1-hdegoede@redhat.com>
Use the generic SSP enable sequence from bytcr/PlatformEnableSeq.conf,
this is identical to the replaced code, call the generic disable sequence
on shutdown (this is new) and move the rt5651 enable sequence to
a new rt5651/EnableSeq.conf file for easy reuse in board-specific
UCM profiles.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
configure.ac | 1 +
src/conf/ucm/Makefile.am | 1 +
src/conf/ucm/bytcr-rt5651/HiFi.conf | 5 +-
src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf | 155 --------------------
src/conf/ucm/rt5651/EnableSeq.conf | 46 ++++++
src/conf/ucm/rt5651/Makefile.am | 4 +
6 files changed, 55 insertions(+), 157 deletions(-)
create mode 100644 src/conf/ucm/rt5651/EnableSeq.conf
create mode 100644 src/conf/ucm/rt5651/Makefile.am
diff --git a/configure.ac b/configure.ac
index adc654e2..85a6be80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -747,6 +747,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
src/conf/ucm/PAZ00/Makefile \
src/conf/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/Makefile \
src/conf/ucm/rt5640/Makefile \
+ src/conf/ucm/rt5651/Makefile \
src/conf/ucm/SDP4430/Makefile \
src/conf/ucm/skylake-rt286/Makefile \
src/conf/ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR/Makefile \
diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am
index 1e51f73e..669e98d5 100644
--- a/src/conf/ucm/Makefile.am
+++ b/src/conf/ucm/Makefile.am
@@ -29,6 +29,7 @@ PandaBoardES \
PAZ00 \
PIPO-W2S-Defaultstring-CherryTrailCR \
rt5640 \
+rt5651 \
SDP4430 \
skylake-rt286 \
TECLAST-X80Pro-Defaultstring-CherryTrailCR \
diff --git a/src/conf/ucm/bytcr-rt5651/HiFi.conf b/src/conf/ucm/bytcr-rt5651/HiFi.conf
index 42fa2c9a..fd878f4a 100644
--- a/src/conf/ucm/bytcr-rt5651/HiFi.conf
+++ b/src/conf/ucm/bytcr-rt5651/HiFi.conf
@@ -3,12 +3,13 @@
SectionVerb {
EnableSequence [
cdev "hw:bytcrrt5651"
- exec "echo HiFi enable sequence"
+ <bytcr/PlatformEnableSeq.conf>
+ <rt5651/EnableSeq.conf>
]
DisableSequence [
cdev "hw:bytcrrt5651"
- exec "echo HiFi disable sequence"
+ <bytcr/PlatformDisableSeq.conf>
]
Value {
diff --git a/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf b/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf
index 4bcc6a6c..45889d82 100644
--- a/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf
+++ b/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf
@@ -7,159 +7,4 @@ SectionUseCase."HiFi" {
SectionDefaults [
cdev "hw:bytcrrt5651"
-
- # media mixer settings
- # compress
- cset "name='media0_in Gain 0 Switch' on"
- cset "name='media0_in Gain 0 Volume' 0"
- # normal
- cset "name='media1_in Gain 0 Switch' on"
- cset "name='media1_in Gain 0 Volume' 0"
- # swm loopback
- cset "name='media2_in Gain 0 Switch' off"
- cset "name='media2_in Gain 0 Volume' 0%"
- # deep buffer
- cset "name='media3_in Gain 0 Switch' on"
- cset "name='media3_in Gain 0 Volume' 0"
- cset "name='media0_out mix 0 media0_in Switch' on"
- cset "name='media0_out mix 0 media1_in Switch' on"
- cset "name='media0_out mix 0 media2_in Switch' off"
- cset "name='media0_out mix 0 media3_in Switch' on"
- cset "name='media1_out mix 0 media0_in Switch' off"
- cset "name='media1_out mix 0 media1_in Switch' off"
- cset "name='media1_out mix 0 media2_in Switch' off"
- cset "name='media1_out mix 0 media3_in Switch' off"
- cset "name='pcm0_in Gain 0 Switch' on"
- cset "name='pcm0_in Gain 0 Volume' 0"
- cset "name='pcm1_in Gain 0 Switch' off"
- cset "name='pcm1_in Gain 0 Volume' 0%"
-
- # codec0_out settings used when SSP2 is connected
- cset "name='codec_out0 mix 0 codec_in0 Switch' off"
- cset "name='codec_out0 mix 0 codec_in1 Switch' off"
- cset "name='codec_out0 mix 0 media_loop1_in Switch' off"
- cset "name='codec_out0 mix 0 media_loop2_in Switch' off"
- cset "name='codec_out0 mix 0 pcm0_in Switch' on"
- cset "name='codec_out0 mix 0 pcm1_in Switch' off"
- cset "name='codec_out0 mix 0 sprot_loop_in Switch' off"
- cset "name='codec_out0 Gain 0 Switch' on"
- cset "name='codec_out0 Gain 0 Volume' 0"
-
- # modem_out settings used when SSP0 is connected
- cset "name='modem_out mix 0 codec_in0 Switch' off"
- cset "name='modem_out mix 0 codec_in1 Switch' off"
- cset "name='modem_out mix 0 media_loop1_in Switch' off"
- cset "name='modem_out mix 0 media_loop2_in Switch' off"
- cset "name='modem_out mix 0 pcm0_in Switch' on"
- cset "name='modem_out mix 0 pcm1_in Switch' off"
- cset "name='modem_out mix 0 sprot_loop_in Switch' off"
- cset "name='modem_out Gain 0 Switch' on"
- cset "name='modem_out Gain 0 Volume' 0"
-
- # input settings
- # pcm1_out settings
-
- # input used when SSP2 is connected
- cset "name='codec_in0 Gain 0 Switch' on"
- cset "name='codec_in0 Gain 0 Volume' 0"
-
- # input used when SSP0 is connected
- cset "name='modem_in Gain 0 Switch' on"
- cset "name='modem_in Gain 0 Volume' 0"
-
- cset "name='pcm1_out mix 0 codec_in0 Switch' on"
- cset "name='pcm1_out mix 0 modem_in Switch' on"
- cset "name='pcm1_out mix 0 codec_in1 Switch' off"
- cset "name='pcm1_out mix 0 media_loop1_in Switch' off"
- cset "name='pcm1_out mix 0 media_loop2_in Switch' off"
- cset "name='pcm1_out mix 0 pcm0_in Switch' off"
- cset "name='pcm1_out mix 0 pcm1_in Switch' off"
- cset "name='pcm1_out mix 0 sprot_loop_in Switch' off"
- cset "name='pcm1_out Gain 0 Switch' on"
- cset "name='pcm1_out Gain 0 Volume' 0"
-
- # disable codec_out1
- cset "name='codec_out1 mix 0 codec_in0 Switch' off"
- cset "name='codec_out1 mix 0 codec_in1 Switch' off"
- cset "name='codec_out1 mix 0 media_loop1_in Switch' off"
- cset "name='codec_out1 mix 0 media_loop2_in Switch' off"
- cset "name='codec_out1 mix 0 pcm0_in Switch' off"
- cset "name='codec_out1 mix 0 pcm1_in Switch' off"
- cset "name='codec_out1 mix 0 sprot_loop_in Switch' off"
- cset "name='codec_out1 Gain 0 Switch' off"
- cset "name='codec_out1 Gain 0 Volume' 0%"
-
- # disable codec_in1
- cset "name='codec_in1 Gain 0 Switch' off"
- cset "name='codec_in1 Gain 0 Volume' 0%"
-
- # disable all loops
- cset "name='media_loop1_out mix 0 codec_in0 Switch' off"
- cset "name='media_loop1_out mix 0 codec_in1 Switch' off"
- cset "name='media_loop1_out mix 0 media_loop1_in Switch' off"
- cset "name='media_loop1_out mix 0 media_loop2_in Switch' off"
- cset "name='media_loop1_out mix 0 pcm0_in Switch' off"
- cset "name='media_loop1_out mix 0 pcm1_in Switch' off"
- cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off"
- cset "name='media_loop2_out mix 0 codec_in0 Switch' off"
- cset "name='media_loop2_out mix 0 codec_in1 Switch' off"
- cset "name='media_loop2_out mix 0 media_loop1_in Switch' off"
- cset "name='media_loop2_out mix 0 media_loop2_in Switch' off"
- cset "name='media_loop2_out mix 0 pcm0_in Switch' off"
- cset "name='media_loop2_out mix 0 pcm1_in Switch' off"
- cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off"
- cset "name='sprot_loop_out mix 0 codec_in0 Switch' off"
- cset "name='sprot_loop_out mix 0 codec_in1 Switch' off"
- cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off"
- cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off"
- cset "name='sprot_loop_out mix 0 pcm0_in Switch' off"
- cset "name='sprot_loop_out mix 0 pcm1_in Switch' off"
- cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off"
-
- # default state
- cset "name='HPO MIX DAC1 Switch' on"
- cset "name='HPO MIX HPVOL Switch' off"
- cset "name='HPO L Playback Switch' off"
- cset "name='HPO R Playback Switch' off"
- cset "name='HPOVOL L Switch' on"
- cset "name='HPOVOL R Switch' on"
- cset "name='LOUT MIX DAC L1 Switch' on"
- cset "name='LOUT MIX DAC R1 Switch' on"
- cset "name='IN1 Boost' 1"
- cset "name='IN2 Boost' 1"
- cset "name='IF1 ASRC Switch' on"
- cset "name='LOUT L Playback Switch' off"
- cset "name='LOUT R Playback Switch' off"
- cset "name='Stereo DAC MIXL DAC L1 Switch' on"
- cset "name='Stereo DAC MIXR DAC R1 Switch' on"
- cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
- cset "name='Stereo1 ADC MIXR ADC2 Switch' on"
- cset "name='Stereo2 ADC MIXL ADC1 Switch' on"
- cset "name='Stereo2 ADC MIXL ADC2 Switch' on"
- cset "name='Stereo2 ADC MIXR ADC1 Switch' on"
- cset "name='Stereo2 ADC MIXR ADC2 Switch' on"
- cset "name='Headphone Switch' off"
- cset "name='Speaker Switch' off"
-
- # volumes for 0dB
- cset "name='OUT Playback Volume' 31"
- cset "name='HP Playback Volume' 31"
- cset "name='IN Capture Volume' 23"
- cset "name='ADC Capture Volume' 47"
- cset "name='DAC1 Playback Volume' 175"
-
- # input
- cset "name='Stereo1 ADC L1 Mux' ADC"
- cset "name='Stereo1 ADC R1 Mux' ADC"
- cset "name='Stereo1 ADC MIXL ADC1 Switch' on"
- cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
- cset "name='RECMIXL BST1 Switch' off"
- cset "name='RECMIXR BST1 Switch' off"
- cset "name='RECMIXL BST3 Switch' off"
- cset "name='RECMIXR BST3 Switch' off"
- cset "name='RECMIXL BST2 Switch' off"
- cset "name='RECMIXR BST2 Switch' off"
- cset "name='Headset Mic Switch' off"
- cset "name='Internal Mic Switch' off"
- cset "name='Line In Switch' off"
]
diff --git a/src/conf/ucm/rt5651/EnableSeq.conf b/src/conf/ucm/rt5651/EnableSeq.conf
new file mode 100644
index 00000000..3ef9afc0
--- /dev/null
+++ b/src/conf/ucm/rt5651/EnableSeq.conf
@@ -0,0 +1,46 @@
+# default state
+cset "name='HPO MIX DAC1 Switch' on"
+cset "name='HPO MIX HPVOL Switch' off"
+cset "name='HPO L Playback Switch' off"
+cset "name='HPO R Playback Switch' off"
+cset "name='HPOVOL L Switch' on"
+cset "name='HPOVOL R Switch' on"
+cset "name='LOUT MIX DAC L1 Switch' on"
+cset "name='LOUT MIX DAC R1 Switch' on"
+cset "name='IN1 Boost' 1"
+cset "name='IN2 Boost' 1"
+cset "name='IF1 ASRC Switch' on"
+cset "name='LOUT L Playback Switch' off"
+cset "name='LOUT R Playback Switch' off"
+cset "name='Stereo DAC MIXL DAC L1 Switch' on"
+cset "name='Stereo DAC MIXR DAC R1 Switch' on"
+cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
+cset "name='Stereo1 ADC MIXR ADC2 Switch' on"
+cset "name='Stereo2 ADC MIXL ADC1 Switch' on"
+cset "name='Stereo2 ADC MIXL ADC2 Switch' on"
+cset "name='Stereo2 ADC MIXR ADC1 Switch' on"
+cset "name='Stereo2 ADC MIXR ADC2 Switch' on"
+cset "name='Headphone Switch' off"
+cset "name='Speaker Switch' off"
+
+# volumes for 0dB
+cset "name='OUT Playback Volume' 31"
+cset "name='HP Playback Volume' 31"
+cset "name='IN Capture Volume' 23"
+cset "name='ADC Capture Volume' 47"
+cset "name='DAC1 Playback Volume' 175"
+
+# input
+cset "name='Stereo1 ADC L1 Mux' ADC"
+cset "name='Stereo1 ADC R1 Mux' ADC"
+cset "name='Stereo1 ADC MIXL ADC1 Switch' on"
+cset "name='Stereo1 ADC MIXR ADC1 Switch' on"
+cset "name='RECMIXL BST1 Switch' off"
+cset "name='RECMIXR BST1 Switch' off"
+cset "name='RECMIXL BST3 Switch' off"
+cset "name='RECMIXR BST3 Switch' off"
+cset "name='RECMIXL BST2 Switch' off"
+cset "name='RECMIXR BST2 Switch' off"
+cset "name='Headset Mic Switch' off"
+cset "name='Internal Mic Switch' off"
+cset "name='Line In Switch' off"
diff --git a/src/conf/ucm/rt5651/Makefile.am b/src/conf/ucm/rt5651/Makefile.am
new file mode 100644
index 00000000..8a22159c
--- /dev/null
+++ b/src/conf/ucm/rt5651/Makefile.am
@@ -0,0 +1,4 @@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+ucmdir = $(alsaconfigdir)/ucm/rt5651
+ucm_DATA = EnableSeq.conf
+EXTRA_DIST = $(ucm_DATA)
--
2.17.1
next prev parent reply other threads:[~2018-07-20 7:27 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-20 7:27 [PATCH 00/14] conf/ucm: bytcr-rt5651: Various improvements + long-name profiles addition Hans de Goede
2018-07-20 7:27 ` [PATCH 01/14] conf/ucm: bytcr-rt5645: Use the generic bytcr/PlatformEnableSeq.conf Hans de Goede
2018-07-20 7:27 ` [PATCH 02/14] conf/ucm: bytcr-rt5651: Add support for boards using SSP0 Hans de Goede
2018-07-20 7:27 ` [PATCH 03/14] conf/ucm: bytcr-rt5651: Do not use both DAC1 and HPVOL inputs for HP Hans de Goede
2018-07-20 7:27 ` [PATCH 04/14] conf/ucm: bytcr-rt5651: Configure all volumes at 0dB Hans de Goede
2018-07-20 13:48 ` Pierre-Louis Bossart
2018-08-08 9:02 ` Hans de Goede
2018-07-20 7:27 ` [PATCH 05/14] conf/ucm: bytcr-rt5651: Start with all outputs and inputs disabled Hans de Goede
2018-07-20 7:27 ` [PATCH 06/14] conf/ucm: bytcr-rt5651: Change Speaker/Headphone en/disable sequences to fix switching Hans de Goede
2018-07-20 7:27 ` Hans de Goede [this message]
2018-07-20 13:49 ` [PATCH 07/14] conf/ucm: bytcr-rt5651: Use generic SSP enable + disable sequence Pierre-Louis Bossart
2018-08-08 9:03 ` Hans de Goede
2018-07-20 7:27 ` [PATCH 08/14] conf/ucm: bytcr-rt5651: Fix ADC and Mic capture volumes Hans de Goede
2018-07-20 7:27 ` [PATCH 09/14] conf/ucm: bytcr-rt5651: Add support for mic input on various pins Hans de Goede
2018-07-20 7:27 ` [PATCH 10/14] conf/ucm: bytcr-rt5651: Split into 1 .conf file per input / output Hans de Goede
2018-07-20 7:27 ` [PATCH 11/14] conf/ucm: bytcr-rt5651: Add mono speaker output profile Hans de Goede
2018-07-20 7:27 ` [PATCH 12/14] conf/ucm: bytcr-rt5651: Add long-name UCM profiles Hans de Goede
2018-07-20 7:27 ` [PATCH 13/14] conf/ucm: bytcr-rt5651: Add bytcr-rt5651-mono-spk-in2-mic-hp-swapped config Hans de Goede
2018-07-20 7:27 ` [PATCH 14/14] conf/ucm: bytcr-rt5640: Improve human readable input/output names Hans de Goede
2018-07-20 13:51 ` [PATCH 00/14] conf/ucm: bytcr-rt5651: Various improvements + long-name profiles addition Pierre-Louis Bossart
2018-07-22 8:52 ` Takashi Iwai
2018-08-05 16:46 ` Takashi Iwai
2018-08-06 7:41 ` Hans de Goede
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=20180720072741.4632-8-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=alsa-devel@alsa-project.org \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.de \
/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).