conf/ucm: bytcr-rt5640: Add long-name UCM profiles

With a recently merged kernel commit, the kernel now sets a long-name for
bytcr-rt5640 boards which indicates if a single (mono) speaker or stereo
speakers are used and wether dmic1, in1 or in3 is used for the internal
mic (the headset mic sofar is always in2).

This commit adds UCM profiles for bytcr-rt5640 boards using these new
long-names, based on the generic bytcr-rt5640 profile.

The added profiles have the unnecessary input / output options from the
generic profile removed leaving only 2 input and 2 output options, which
are automatically switched between by e.g. pulse based on jack-detect.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Hans de Goede 2018-05-31 17:10:23 +02:00 committed by Jaroslav Kysela
parent 0f6f2a854f
commit a5343f6fb6
20 changed files with 240 additions and 0 deletions

View File

@ -722,6 +722,12 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
src/conf/ucm/broxton-rt298/Makefile \
src/conf/ucm/bytcr/Makefile \
src/conf/ucm/bytcr-rt5640/Makefile \
src/conf/ucm/bytcr-rt5640-mono-spk-dmic1-mic/Makefile \
src/conf/ucm/bytcr-rt5640-mono-spk-in1-mic/Makefile \
src/conf/ucm/bytcr-rt5640-mono-spk-in3-mic/Makefile \
src/conf/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/Makefile \
src/conf/ucm/bytcr-rt5640-stereo-spk-in1-mic/Makefile \
src/conf/ucm/bytcr-rt5640-stereo-spk-in3-mic/Makefile \
src/conf/ucm/bytcr-rt5651/Makefile \
src/conf/ucm/chtrt5645/Makefile \
src/conf/ucm/chtrt5645-mono-speaker-analog-mic/Makefile \

View File

@ -4,6 +4,12 @@ broadwell-rt286 \
broxton-rt298 \
bytcr \
bytcr-rt5640 \
bytcr-rt5640-mono-spk-dmic1-mic \
bytcr-rt5640-mono-spk-in1-mic \
bytcr-rt5640-mono-spk-in3-mic \
bytcr-rt5640-stereo-spk-dmic1-mic \
bytcr-rt5640-stereo-spk-in1-mic \
bytcr-rt5640-stereo-spk-in3-mic \
bytcr-rt5651 \
chtrt5645 \
chtrt5645-mono-speaker-analog-mic \

View File

@ -0,0 +1,26 @@
# Use case Configuration for bytcr-rt5640
<searchdir:ucm>
SectionVerb {
EnableSequence [
cdev "hw:bytcrrt5640"
<bytcr/PlatformEnableSeq.conf>
<rt5640/EnableSeq.conf>
]
DisableSequence [
]
Value {
PlaybackPCM "hw:bytcrrt5640"
CapturePCM "hw:bytcrrt5640"
}
}
<rt5640/MonoSpeaker.conf>
<rt5640/HeadPhones.conf>
<rt5640/DigitalMics.conf>
<rt5640/HeadsetMic.conf>

View File

@ -0,0 +1,4 @@
alsaconfigdir = @ALSA_CONFIG_DIR@
ucmdir = $(alsaconfigdir)/ucm/bytcr-rt5640-mono-spk-dmic1-mic
ucm_DATA = bytcr-rt5640-mono-spk-dmic1-mic.conf HiFi.conf
EXTRA_DIST = $(ucm_DATA)

View File

@ -0,0 +1,8 @@
SectionUseCase."HiFi" {
File "../bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf"
Comment "Play HiFi quality Music"
}
SectionDefaults [
cdev "hw:bytcrrt5640"
]

View File

@ -0,0 +1,26 @@
# Use case Configuration for bytcr-rt5640
<searchdir:ucm>
SectionVerb {
EnableSequence [
cdev "hw:bytcrrt5640"
<bytcr/PlatformEnableSeq.conf>
<rt5640/EnableSeq.conf>
]
DisableSequence [
]
Value {
PlaybackPCM "hw:bytcrrt5640"
CapturePCM "hw:bytcrrt5640"
}
}
<rt5640/MonoSpeaker.conf>
<rt5640/HeadPhones.conf>
<rt5640/IN1-InternalMic.conf>
<rt5640/HeadsetMic.conf>

View File

@ -0,0 +1,4 @@
alsaconfigdir = @ALSA_CONFIG_DIR@
ucmdir = $(alsaconfigdir)/ucm/bytcr-rt5640-mono-spk-in1-mic
ucm_DATA = bytcr-rt5640-mono-spk-in1-mic.conf HiFi.conf
EXTRA_DIST = $(ucm_DATA)

View File

@ -0,0 +1,8 @@
SectionUseCase."HiFi" {
File "../bytcr-rt5640-mono-spk-in1-mic/HiFi.conf"
Comment "Play HiFi quality Music"
}
SectionDefaults [
cdev "hw:bytcrrt5640"
]

View File

@ -0,0 +1,26 @@
# Use case Configuration for bytcr-rt5640
<searchdir:ucm>
SectionVerb {
EnableSequence [
cdev "hw:bytcrrt5640"
<bytcr/PlatformEnableSeq.conf>
<rt5640/EnableSeq.conf>
]
DisableSequence [
]
Value {
PlaybackPCM "hw:bytcrrt5640"
CapturePCM "hw:bytcrrt5640"
}
}
<rt5640/MonoSpeaker.conf>
<rt5640/HeadPhones.conf>
<rt5640/IN3-InternalMic.conf>
<rt5640/HeadsetMic.conf>

View File

@ -0,0 +1,4 @@
alsaconfigdir = @ALSA_CONFIG_DIR@
ucmdir = $(alsaconfigdir)/ucm/bytcr-rt5640-mono-spk-in3-mic
ucm_DATA = bytcr-rt5640-mono-spk-in3-mic.conf HiFi.conf
EXTRA_DIST = $(ucm_DATA)

View File

@ -0,0 +1,8 @@
SectionUseCase."HiFi" {
File "../bytcr-rt5640-mono-spk-in3-mic/HiFi.conf"
Comment "Play HiFi quality Music"
}
SectionDefaults [
cdev "hw:bytcrrt5640"
]

View File

@ -0,0 +1,26 @@
# Use case Configuration for bytcr-rt5640
<searchdir:ucm>
SectionVerb {
EnableSequence [
cdev "hw:bytcrrt5640"
<bytcr/PlatformEnableSeq.conf>
<rt5640/EnableSeq.conf>
]
DisableSequence [
]
Value {
PlaybackPCM "hw:bytcrrt5640"
CapturePCM "hw:bytcrrt5640"
}
}
<rt5640/Speaker.conf>
<rt5640/HeadPhones.conf>
<rt5640/DigitalMics.conf>
<rt5640/HeadsetMic.conf>

View File

@ -0,0 +1,4 @@
alsaconfigdir = @ALSA_CONFIG_DIR@
ucmdir = $(alsaconfigdir)/ucm/bytcr-rt5640-stereo-spk-dmic1-mic
ucm_DATA = bytcr-rt5640-stereo-spk-dmic1-mic.conf HiFi.conf
EXTRA_DIST = $(ucm_DATA)

View File

@ -0,0 +1,8 @@
SectionUseCase."HiFi" {
File "../bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf"
Comment "Play HiFi quality Music"
}
SectionDefaults [
cdev "hw:bytcrrt5640"
]

View File

@ -0,0 +1,26 @@
# Use case Configuration for bytcr-rt5640
<searchdir:ucm>
SectionVerb {
EnableSequence [
cdev "hw:bytcrrt5640"
<bytcr/PlatformEnableSeq.conf>
<rt5640/EnableSeq.conf>
]
DisableSequence [
]
Value {
PlaybackPCM "hw:bytcrrt5640"
CapturePCM "hw:bytcrrt5640"
}
}
<rt5640/Speaker.conf>
<rt5640/HeadPhones.conf>
<rt5640/IN1-InternalMic.conf>
<rt5640/HeadsetMic.conf>

View File

@ -0,0 +1,4 @@
alsaconfigdir = @ALSA_CONFIG_DIR@
ucmdir = $(alsaconfigdir)/ucm/bytcr-rt5640-stereo-spk-in1-mic
ucm_DATA = bytcr-rt5640-stereo-spk-in1-mic.conf HiFi.conf
EXTRA_DIST = $(ucm_DATA)

View File

@ -0,0 +1,8 @@
SectionUseCase."HiFi" {
File "../bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf"
Comment "Play HiFi quality Music"
}
SectionDefaults [
cdev "hw:bytcrrt5640"
]

View File

@ -0,0 +1,26 @@
# Use case Configuration for bytcr-rt5640
<searchdir:ucm>
SectionVerb {
EnableSequence [
cdev "hw:bytcrrt5640"
<bytcr/PlatformEnableSeq.conf>
<rt5640/EnableSeq.conf>
]
DisableSequence [
]
Value {
PlaybackPCM "hw:bytcrrt5640"
CapturePCM "hw:bytcrrt5640"
}
}
<rt5640/Speaker.conf>
<rt5640/HeadPhones.conf>
<rt5640/IN3-InternalMic.conf>
<rt5640/HeadsetMic.conf>

View File

@ -0,0 +1,4 @@
alsaconfigdir = @ALSA_CONFIG_DIR@
ucmdir = $(alsaconfigdir)/ucm/bytcr-rt5640-stereo-spk-in3-mic
ucm_DATA = bytcr-rt5640-stereo-spk-in3-mic.conf HiFi.conf
EXTRA_DIST = $(ucm_DATA)

View File

@ -0,0 +1,8 @@
SectionUseCase."HiFi" {
File "../bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf"
Comment "Play HiFi quality Music"
}
SectionDefaults [
cdev "hw:bytcrrt5640"
]