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 10/14] conf/ucm: bytcr-rt5651: Split into 1 .conf file per input / output
Date: Fri, 20 Jul 2018 09:27:37 +0200 [thread overview]
Message-ID: <20180720072741.4632-11-hdegoede@redhat.com> (raw)
In-Reply-To: <20180720072741.4632-1-hdegoede@redhat.com>
Split the bytcr-rt5651 config into 1 .conf file per input / output as
has already been done for the bytcr-rt5640 and the chtnau8824 profiles.
This allows easy creation of long-name profiles with the specific input /
output combinations found on a board without needing to copy and paste
things.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
src/conf/ucm/bytcr-rt5651/HiFi.conf | 197 +---------------------
src/conf/ucm/rt5651/HeadPhones.conf | 31 ++++
src/conf/ucm/rt5651/IN1-InternalMic.conf | 27 +++
src/conf/ucm/rt5651/IN12-InternalMic.conf | 31 ++++
src/conf/ucm/rt5651/IN2-InternalMic.conf | 27 +++
src/conf/ucm/rt5651/IN3-HeadsetMic.conf | 28 +++
src/conf/ucm/rt5651/Makefile.am | 4 +-
src/conf/ucm/rt5651/Speaker.conf | 30 ++++
8 files changed, 185 insertions(+), 190 deletions(-)
create mode 100644 src/conf/ucm/rt5651/HeadPhones.conf
create mode 100644 src/conf/ucm/rt5651/IN1-InternalMic.conf
create mode 100644 src/conf/ucm/rt5651/IN12-InternalMic.conf
create mode 100644 src/conf/ucm/rt5651/IN2-InternalMic.conf
create mode 100644 src/conf/ucm/rt5651/IN3-HeadsetMic.conf
create mode 100644 src/conf/ucm/rt5651/Speaker.conf
diff --git a/src/conf/ucm/bytcr-rt5651/HiFi.conf b/src/conf/ucm/bytcr-rt5651/HiFi.conf
index 54c365d9..961b2604 100644
--- a/src/conf/ucm/bytcr-rt5651/HiFi.conf
+++ b/src/conf/ucm/bytcr-rt5651/HiFi.conf
@@ -1,5 +1,7 @@
# Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651
+<searchdir:ucm>
+
SectionVerb {
EnableSequence [
cdev "hw:bytcrrt5651"
@@ -18,194 +20,11 @@ SectionVerb {
}
}
-SectionDevice."Headphones" {
- Comment "Headphones playback"
-
- ConflictingDevice [
- "Speaker"
- ]
-
- EnableSequence [
- cdev "hw:bytcrrt5651"
- exec "echo Headphones playback enable sequence"
- cset "name='Headphone Switch' on"
- cset "name='HPO L Playback Switch' on"
- cset "name='HPO R Playback Switch' on"
- # Done after turning the HP on to keep the bias and clk on
- cset "name='Speaker Switch' off"
- cset "name='LOUT L Playback Switch' off"
- cset "name='LOUT R Playback Switch' off"
- ]
-
- DisableSequence [
- cdev "hw:bytcrrt5651"
- exec "echo Headphones playback disable sequence"
- # This is done by the Speaker EnableSequence, so that the
- # Platform Clock and BIAS do not temporarily get turned off
- # as that breaks audio-streams which are playing when
- # switching between Speaker/Headphone
- ]
-
- Value {
- PlaybackChannels "2"
- JackControl "Headphone Jack"
- }
-}
-
-SectionDevice."Speaker" {
- Comment "Speaker playback"
-
- ConflictingDevice [
- "Headphones"
- ]
-
- EnableSequence [
- cdev "hw:bytcrrt5651"
- exec "echo Speaker enable sequence"
- cset "name='Speaker Switch' on"
- cset "name='LOUT L Playback Switch' on"
- cset "name='LOUT R Playback Switch' on"
- # Done after turning the speaker on to keep the bias and clk on
- cset "name='Headphone Switch' off"
- cset "name='HPO L Playback Switch' off"
- cset "name='HPO R Playback Switch' off"
- ]
-
- DisableSequence [
- cdev "hw:bytcrrt5651"
- exec "echo Speaker disable sequence"
- # This is done by the Headphones EnableSequence, so that the
- # Platform Clock and BIAS do not temporarily get turned off
- # as that breaks audio-streams which are playing when
- # switching between Speaker/Headphone
- ]
-
- Value {
- PlaybackChannels "2"
- }
-}
-
-SectionDevice."InternalMic-IN1" {
- Comment "Internal Microphone on IN1"
-
- ConflictingDevice [
- "InternalMic-IN2"
- "InternalMic-IN12"
- "HeadsetMic-IN3"
- ]
-
- EnableSequence [
- cdev "hw:bytcrrt5651"
- exec "echo Internal Mic IN1 Microphone enable sequence"
- cset "name='Internal Mic Switch' on"
- cset "name='RECMIXL BST1 Switch' on"
- cset "name='RECMIXR BST1 Switch' on"
- ]
-
- DisableSequence [
- cdev "hw:bytcrrt5651"
- exec "echo Internal Mic IN1 Microphone disable sequence"
- cset "name='Internal Mic Switch' off"
- cset "name='RECMIXL BST1 Switch' off"
- cset "name='RECMIXR BST1 Switch' off"
- ]
-
- Value {
- CaptureChannels "2"
- }
-}
-
-SectionDevice."InternalMic-IN2" {
- Comment "Internal Microphone on IN2"
-
- ConflictingDevice [
- "InternalMic-IN1"
- "InternalMic-IN12"
- "HeadsetMic-IN3"
- ]
-
- EnableSequence [
- cdev "hw:bytcrrt5651"
- exec "echo Internal Mic IN2 Microphone enable sequence"
- cset "name='Internal Mic Switch' on"
- cset "name='RECMIXL BST2 Switch' on"
- cset "name='RECMIXR BST2 Switch' on"
- ]
-
- DisableSequence [
- cdev "hw:bytcrrt5651"
- exec "echo Internal Mic IN2 Microphone disable sequence"
- cset "name='Internal Mic Switch' off"
- cset "name='RECMIXL BST2 Switch' off"
- cset "name='RECMIXR BST2 Switch' off"
- ]
-
- Value {
- CaptureChannels "2"
- }
-}
-
-SectionDevice."InternalMic-IN12" {
- Comment "Internal Microphones on IN1 and IN2"
-
- ConflictingDevice [
- "InternalMic-IN1"
- "InternalMic-IN2"
- "HeadsetMic-IN3"
- ]
-
- EnableSequence [
- cdev "hw:bytcrrt5651"
- exec "echo Internal Mic IN12 Microphone enable sequence"
- cset "name='Internal Mic Switch' on"
- cset "name='RECMIXL BST1 Switch' on"
- cset "name='RECMIXR BST1 Switch' on"
- cset "name='RECMIXL BST2 Switch' on"
- cset "name='RECMIXR BST2 Switch' on"
- ]
-
- DisableSequence [
- cdev "hw:bytcrrt5651"
- exec "echo Internal Mic IN12 Microphone disable sequence"
- cset "name='Internal Mic Switch' off"
- cset "name='RECMIXL BST1 Switch' off"
- cset "name='RECMIXR BST1 Switch' off"
- cset "name='RECMIXL BST2 Switch' off"
- cset "name='RECMIXR BST2 Switch' off"
- ]
-
- Value {
- CaptureChannels "2"
- }
-}
-
-SectionDevice."HeadsetMic-IN3" {
- Comment "Headset Microphone"
-
- ConflictingDevice [
- "InternalMic-IN1"
- "InternalMic-IN2"
- "InternalMic-IN12"
- ]
+<rt5651/Speaker.conf>
+<rt5651/HeadPhones.conf>
- EnableSequence [
- cdev "hw:bytcrrt5651"
- exec "echo HeadsetMic-IN3 Microphone enable sequence"
- cset "name='Headset Mic Switch' on"
- cset "name='RECMIXL BST3 Switch' on"
- cset "name='RECMIXR BST3 Switch' on"
- ]
- DisableSequence [
- cdev "hw:bytcrrt5651"
- exec "echo HeadsetMic-IN3 Microphone disable sequence"
- cset "name='Headset Mic Switch' off"
- cset "name='RECMIXL BST3 Switch' off"
- cset "name='RECMIXR BST3 Switch' off"
- ]
-
- Value {
- CaptureChannels "2"
- JackControl "Headset Mic Jack"
- }
-}
+<rt5651/IN1-InternalMic.conf>
+<rt5651/IN2-InternalMic.conf>
+<rt5651/IN12-InternalMic.conf>
+<rt5651/IN3-HeadsetMic.conf>
diff --git a/src/conf/ucm/rt5651/HeadPhones.conf b/src/conf/ucm/rt5651/HeadPhones.conf
new file mode 100644
index 00000000..b9323a36
--- /dev/null
+++ b/src/conf/ucm/rt5651/HeadPhones.conf
@@ -0,0 +1,31 @@
+SectionDevice."Headphones" {
+ Comment "Headphones"
+
+ ConflictingDevice [
+ "Speaker"
+ ]
+
+ EnableSequence [
+ cdev "hw:bytcrrt5651"
+ cset "name='Headphone Switch' on"
+ cset "name='HPO L Playback Switch' on"
+ cset "name='HPO R Playback Switch' on"
+ # Done after turning the HP on to keep the bias and clk on
+ cset "name='Speaker Switch' off"
+ cset "name='LOUT L Playback Switch' off"
+ cset "name='LOUT R Playback Switch' off"
+ ]
+
+ DisableSequence [
+ cdev "hw:bytcrrt5651"
+ # This is done by the Speaker EnableSequence, so that the
+ # Platform Clock and BIAS do not temporarily get turned off
+ # as that breaks audio-streams which are playing when
+ # switching between Speaker/Headphone
+ ]
+
+ Value {
+ PlaybackChannels "2"
+ JackControl "Headphone Jack"
+ }
+}
diff --git a/src/conf/ucm/rt5651/IN1-InternalMic.conf b/src/conf/ucm/rt5651/IN1-InternalMic.conf
new file mode 100644
index 00000000..85e25a5c
--- /dev/null
+++ b/src/conf/ucm/rt5651/IN1-InternalMic.conf
@@ -0,0 +1,27 @@
+SectionDevice."InternalMic-IN1" {
+ Comment "Internal Microphone on IN1"
+
+ ConflictingDevice [
+ "InternalMic-IN2"
+ "InternalMic-IN12"
+ "HeadsetMic-IN3"
+ ]
+
+ EnableSequence [
+ cdev "hw:bytcrrt5651"
+ cset "name='Internal Mic Switch' on"
+ cset "name='RECMIXL BST1 Switch' on"
+ cset "name='RECMIXR BST1 Switch' on"
+ ]
+
+ DisableSequence [
+ cdev "hw:bytcrrt5651"
+ cset "name='Internal Mic Switch' off"
+ cset "name='RECMIXL BST1 Switch' off"
+ cset "name='RECMIXR BST1 Switch' off"
+ ]
+
+ Value {
+ CaptureChannels "2"
+ }
+}
diff --git a/src/conf/ucm/rt5651/IN12-InternalMic.conf b/src/conf/ucm/rt5651/IN12-InternalMic.conf
new file mode 100644
index 00000000..f1cc17fe
--- /dev/null
+++ b/src/conf/ucm/rt5651/IN12-InternalMic.conf
@@ -0,0 +1,31 @@
+SectionDevice."InternalMic-IN12" {
+ Comment "Internal Microphones on IN1 and IN2"
+
+ ConflictingDevice [
+ "InternalMic-IN1"
+ "InternalMic-IN2"
+ "HeadsetMic-IN3"
+ ]
+
+ EnableSequence [
+ cdev "hw:bytcrrt5651"
+ cset "name='Internal Mic Switch' on"
+ cset "name='RECMIXL BST1 Switch' on"
+ cset "name='RECMIXR BST1 Switch' on"
+ cset "name='RECMIXL BST2 Switch' on"
+ cset "name='RECMIXR BST2 Switch' on"
+ ]
+
+ DisableSequence [
+ cdev "hw:bytcrrt5651"
+ cset "name='Internal Mic Switch' off"
+ cset "name='RECMIXL BST1 Switch' off"
+ cset "name='RECMIXR BST1 Switch' off"
+ cset "name='RECMIXL BST2 Switch' off"
+ cset "name='RECMIXR BST2 Switch' off"
+ ]
+
+ Value {
+ CaptureChannels "2"
+ }
+}
diff --git a/src/conf/ucm/rt5651/IN2-InternalMic.conf b/src/conf/ucm/rt5651/IN2-InternalMic.conf
new file mode 100644
index 00000000..18f74e1a
--- /dev/null
+++ b/src/conf/ucm/rt5651/IN2-InternalMic.conf
@@ -0,0 +1,27 @@
+SectionDevice."InternalMic-IN2" {
+ Comment "Internal Microphone on IN2"
+
+ ConflictingDevice [
+ "InternalMic-IN1"
+ "InternalMic-IN12"
+ "HeadsetMic-IN3"
+ ]
+
+ EnableSequence [
+ cdev "hw:bytcrrt5651"
+ cset "name='Internal Mic Switch' on"
+ cset "name='RECMIXL BST2 Switch' on"
+ cset "name='RECMIXR BST2 Switch' on"
+ ]
+
+ DisableSequence [
+ cdev "hw:bytcrrt5651"
+ cset "name='Internal Mic Switch' off"
+ cset "name='RECMIXL BST2 Switch' off"
+ cset "name='RECMIXR BST2 Switch' off"
+ ]
+
+ Value {
+ CaptureChannels "2"
+ }
+}
diff --git a/src/conf/ucm/rt5651/IN3-HeadsetMic.conf b/src/conf/ucm/rt5651/IN3-HeadsetMic.conf
new file mode 100644
index 00000000..bfd0b009
--- /dev/null
+++ b/src/conf/ucm/rt5651/IN3-HeadsetMic.conf
@@ -0,0 +1,28 @@
+SectionDevice."HeadsetMic-IN3" {
+ Comment "Headset Microphone"
+
+ ConflictingDevice [
+ "InternalMic-IN1"
+ "InternalMic-IN2"
+ "InternalMic-IN12"
+ ]
+
+ EnableSequence [
+ cdev "hw:bytcrrt5651"
+ cset "name='Headset Mic Switch' on"
+ cset "name='RECMIXL BST3 Switch' on"
+ cset "name='RECMIXR BST3 Switch' on"
+ ]
+
+ DisableSequence [
+ cdev "hw:bytcrrt5651"
+ cset "name='Headset Mic Switch' off"
+ cset "name='RECMIXL BST3 Switch' off"
+ cset "name='RECMIXR BST3 Switch' off"
+ ]
+
+ Value {
+ CaptureChannels "2"
+ JackControl "Headset Mic Jack"
+ }
+}
diff --git a/src/conf/ucm/rt5651/Makefile.am b/src/conf/ucm/rt5651/Makefile.am
index 8a22159c..abd45ad7 100644
--- a/src/conf/ucm/rt5651/Makefile.am
+++ b/src/conf/ucm/rt5651/Makefile.am
@@ -1,4 +1,6 @@
alsaconfigdir = @ALSA_CONFIG_DIR@
ucmdir = $(alsaconfigdir)/ucm/rt5651
-ucm_DATA = EnableSeq.conf
+ucm_DATA = EnableSeq.conf HeadPhones.conf IN1-InternalMic.conf \
+ IN2-InternalMic.conf IN12-InternalMic.conf IN3-HeadsetMic.conf \
+ Speaker.conf
EXTRA_DIST = $(ucm_DATA)
diff --git a/src/conf/ucm/rt5651/Speaker.conf b/src/conf/ucm/rt5651/Speaker.conf
new file mode 100644
index 00000000..44168cc5
--- /dev/null
+++ b/src/conf/ucm/rt5651/Speaker.conf
@@ -0,0 +1,30 @@
+SectionDevice."Speaker" {
+ Comment "Speakers"
+
+ ConflictingDevice [
+ "Headphones"
+ ]
+
+ EnableSequence [
+ cdev "hw:bytcrrt5651"
+ cset "name='Speaker Switch' on"
+ cset "name='LOUT L Playback Switch' on"
+ cset "name='LOUT R Playback Switch' on"
+ # Done after turning the speaker on to keep the bias and clk on
+ cset "name='Headphone Switch' off"
+ cset "name='HPO L Playback Switch' off"
+ cset "name='HPO R Playback Switch' off"
+ ]
+
+ DisableSequence [
+ cdev "hw:bytcrrt5651"
+ # This is done by the Headphones EnableSequence, so that the
+ # Platform Clock and BIAS do not temporarily get turned off
+ # as that breaks audio-streams which are playing when
+ # switching between Speaker/Headphone
+ ]
+
+ Value {
+ PlaybackChannels "2"
+ }
+}
--
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 ` [PATCH 07/14] conf/ucm: bytcr-rt5651: Use generic SSP enable + disable sequence Hans de Goede
2018-07-20 13:49 ` 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 ` Hans de Goede [this message]
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-11-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).