mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-10-29 05:40:25 -04:00
conf: Move UCM profile snippets into components subdirectory
We have placed UCM profile snippets to be included by the main config files also in the same directory, src/conf/ucm, it confuses alsaucm program that scans over all subdirectories. It thinks such a file is also the main config file, and spews errors like: % alsaucm ALSA lib utils.c:67:(uc_mgr_config_load) could not open configuration file /usr/share/alsa/ucm/bytcr/bytcr.conf ALSA lib parser.c:1427:(load_master_config) error: could not parse configuration for card bytcr alsaucm: unable to obtain card list: No such file or directory Actually we already defined the subdirectory for such components, and they are skipped at parsing the main configs. So we just need to move the files there -- this is what's done here. One more thing done here is to add a new component subdirectory, platforms, for definitions bytcr/* that don't match with neither the existing ones (codecs nor dsps). Suggested-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Jaroslav Kysela <perex@perex.cz> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Tested-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
parent
7ca1f6e78c
commit
d48adc2a20
52 changed files with 147 additions and 138 deletions
10
configure.ac
10
configure.ac
|
|
@ -720,7 +720,6 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
|
|||
src/conf/ucm/ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN/Makefile \
|
||||
src/conf/ucm/broadwell-rt286/Makefile \
|
||||
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 \
|
||||
|
|
@ -747,18 +746,21 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
|
|||
src/conf/ucm/HDAudio-Gigabyte-ALC1220DualCodecs/Makefile \
|
||||
src/conf/ucm/HDAudio-Lenovo-DualCodecs/Makefile \
|
||||
src/conf/ucm/LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/Makefile \
|
||||
src/conf/ucm/nau8824/Makefile \
|
||||
src/conf/ucm/PandaBoard/Makefile \
|
||||
src/conf/ucm/PandaBoardES/Makefile \
|
||||
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 \
|
||||
src/conf/ucm/tegraalc5632/Makefile \
|
||||
src/conf/ucm/VEYRON-I2S/Makefile \
|
||||
src/conf/ucm/codecs/Makefile \
|
||||
src/conf/ucm/codecs/nau8824/Makefile \
|
||||
src/conf/ucm/codecs/rt5640/Makefile \
|
||||
src/conf/ucm/codecs/rt5651/Makefile \
|
||||
src/conf/ucm/platforms/Makefile \
|
||||
src/conf/ucm/platforms/bytcr/Makefile \
|
||||
src/conf/topology/Makefile \
|
||||
src/conf/topology/broadwell/Makefile \
|
||||
modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
SUBDIRS=\
|
||||
codecs \
|
||||
platforms \
|
||||
ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN \
|
||||
broadwell-rt286 \
|
||||
broxton-rt298 \
|
||||
bytcr \
|
||||
bytcr-rt5640 \
|
||||
bytcr-rt5640-mono-spk-dmic1-mic \
|
||||
bytcr-rt5640-mono-spk-in1-mic \
|
||||
|
|
@ -29,13 +30,10 @@ gpd-win-pocket-rt5645 \
|
|||
HDAudio-Gigabyte-ALC1220DualCodecs \
|
||||
HDAudio-Lenovo-DualCodecs \
|
||||
LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216 \
|
||||
nau8824 \
|
||||
PandaBoard \
|
||||
PandaBoardES \
|
||||
PAZ00 \
|
||||
PIPO-W2S-Defaultstring-CherryTrailCR \
|
||||
rt5640 \
|
||||
rt5651 \
|
||||
SDP4430 \
|
||||
skylake-rt286 \
|
||||
TECLAST-X80Pro-Defaultstring-CherryTrailCR \
|
||||
|
|
|
|||
|
|
@ -11,18 +11,18 @@ SectionVerb {
|
|||
|
||||
EnableSequence [
|
||||
cdev "hw:chtnau8824"
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<nau8824/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/nau8824/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:chtnau8824"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
}
|
||||
|
||||
<nau8824/MonoSpeaker.conf>
|
||||
<nau8824/HeadPhones.conf>
|
||||
<codecs/nau8824/MonoSpeaker.conf>
|
||||
<codecs/nau8824/HeadPhones.conf>
|
||||
|
||||
<nau8824/InternalMic.conf>
|
||||
<nau8824/HeadsetMic.conf>
|
||||
<codecs/nau8824/InternalMic.conf>
|
||||
<codecs/nau8824/HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ SectionVerb {
|
|||
EnableSequence [
|
||||
cdev "hw:bytcrrt5640"
|
||||
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<rt5640/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/rt5640/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:bytcrrt5640"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
|
||||
Value {
|
||||
|
|
@ -21,8 +21,8 @@ SectionVerb {
|
|||
}
|
||||
}
|
||||
|
||||
<rt5640/MonoSpeaker.conf>
|
||||
<rt5640/HeadPhones.conf>
|
||||
<codecs/rt5640/MonoSpeaker.conf>
|
||||
<codecs/rt5640/HeadPhones.conf>
|
||||
|
||||
<rt5640/DigitalMics.conf>
|
||||
<rt5640/HeadsetMic.conf>
|
||||
<codecs/rt5640/DigitalMics.conf>
|
||||
<codecs/rt5640/HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ SectionVerb {
|
|||
EnableSequence [
|
||||
cdev "hw:bytcrrt5640"
|
||||
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<rt5640/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/rt5640/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:bytcrrt5640"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
|
||||
Value {
|
||||
|
|
@ -21,8 +21,8 @@ SectionVerb {
|
|||
}
|
||||
}
|
||||
|
||||
<rt5640/MonoSpeaker.conf>
|
||||
<rt5640/HeadPhones.conf>
|
||||
<codecs/rt5640/MonoSpeaker.conf>
|
||||
<codecs/rt5640/HeadPhones.conf>
|
||||
|
||||
<rt5640/IN1-InternalMic.conf>
|
||||
<rt5640/HeadsetMic.conf>
|
||||
<codecs/rt5640/IN1-InternalMic.conf>
|
||||
<codecs/rt5640/HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ SectionVerb {
|
|||
EnableSequence [
|
||||
cdev "hw:bytcrrt5640"
|
||||
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<rt5640/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/rt5640/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:bytcrrt5640"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
|
||||
Value {
|
||||
|
|
@ -21,8 +21,8 @@ SectionVerb {
|
|||
}
|
||||
}
|
||||
|
||||
<rt5640/MonoSpeaker.conf>
|
||||
<rt5640/HeadPhones.conf>
|
||||
<codecs/rt5640/MonoSpeaker.conf>
|
||||
<codecs/rt5640/HeadPhones.conf>
|
||||
|
||||
<rt5640/IN3-InternalMic.conf>
|
||||
<rt5640/HeadsetMic.conf>
|
||||
<codecs/rt5640/IN3-InternalMic.conf>
|
||||
<codecs/rt5640/HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ SectionVerb {
|
|||
EnableSequence [
|
||||
cdev "hw:bytcrrt5640"
|
||||
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<rt5640/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/rt5640/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:bytcrrt5640"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
|
||||
Value {
|
||||
|
|
@ -21,8 +21,8 @@ SectionVerb {
|
|||
}
|
||||
}
|
||||
|
||||
<rt5640/Speaker.conf>
|
||||
<rt5640/HeadPhones.conf>
|
||||
<codecs/rt5640/Speaker.conf>
|
||||
<codecs/rt5640/HeadPhones.conf>
|
||||
|
||||
<rt5640/DigitalMics.conf>
|
||||
<rt5640/HeadsetMic.conf>
|
||||
<codecs/rt5640/DigitalMics.conf>
|
||||
<codecs/rt5640/HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ SectionVerb {
|
|||
EnableSequence [
|
||||
cdev "hw:bytcrrt5640"
|
||||
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<rt5640/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/rt5640/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:bytcrrt5640"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
|
||||
Value {
|
||||
|
|
@ -21,8 +21,8 @@ SectionVerb {
|
|||
}
|
||||
}
|
||||
|
||||
<rt5640/Speaker.conf>
|
||||
<rt5640/HeadPhones.conf>
|
||||
<codecs/rt5640/Speaker.conf>
|
||||
<codecs/rt5640/HeadPhones.conf>
|
||||
|
||||
<rt5640/IN1-InternalMic.conf>
|
||||
<rt5640/HeadsetMic.conf>
|
||||
<codecs/rt5640/IN1-InternalMic.conf>
|
||||
<codecs/rt5640/HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ SectionVerb {
|
|||
EnableSequence [
|
||||
cdev "hw:bytcrrt5640"
|
||||
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<rt5640/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/rt5640/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:bytcrrt5640"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
|
||||
Value {
|
||||
|
|
@ -21,8 +21,8 @@ SectionVerb {
|
|||
}
|
||||
}
|
||||
|
||||
<rt5640/Speaker.conf>
|
||||
<rt5640/HeadPhones.conf>
|
||||
<codecs/rt5640/Speaker.conf>
|
||||
<codecs/rt5640/HeadPhones.conf>
|
||||
|
||||
<rt5640/IN3-InternalMic.conf>
|
||||
<rt5640/HeadsetMic.conf>
|
||||
<codecs/rt5640/IN3-InternalMic.conf>
|
||||
<codecs/rt5640/HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@ SectionVerb {
|
|||
EnableSequence [
|
||||
cdev "hw:bytcrrt5640"
|
||||
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<rt5640/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/rt5640/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:bytcrrt5640"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
|
||||
Value {
|
||||
|
|
@ -21,11 +21,11 @@ SectionVerb {
|
|||
}
|
||||
}
|
||||
|
||||
<rt5640/Speaker.conf>
|
||||
<rt5640/MonoSpeaker.conf>
|
||||
<rt5640/HeadPhones.conf>
|
||||
<codecs/rt5640/Speaker.conf>
|
||||
<codecs/rt5640/MonoSpeaker.conf>
|
||||
<codecs/rt5640/HeadPhones.conf>
|
||||
|
||||
<rt5640/DigitalMics.conf>
|
||||
<rt5640/IN1-InternalMic.conf>
|
||||
<rt5640/IN3-InternalMic.conf>
|
||||
<rt5640/HeadsetMic.conf>
|
||||
<codecs/rt5640/DigitalMics.conf>
|
||||
<codecs/rt5640/IN1-InternalMic.conf>
|
||||
<codecs/rt5640/IN3-InternalMic.conf>
|
||||
<codecs/rt5640/HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
SectionVerb {
|
||||
EnableSequence [
|
||||
cdev "hw:bytcrrt5651"
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<rt5651/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/rt5651/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:bytcrrt5651"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
|
||||
Value {
|
||||
|
|
@ -20,8 +20,8 @@ SectionVerb {
|
|||
}
|
||||
}
|
||||
|
||||
<rt5651/MonoSpeaker.conf>
|
||||
<rt5651/HeadPhones.conf>
|
||||
<codecs/rt5651/MonoSpeaker.conf>
|
||||
<codecs/rt5651/HeadPhones.conf>
|
||||
|
||||
<rt5651/IN1-InternalMic.conf>
|
||||
<rt5651/IN3-HeadsetMic.conf>
|
||||
<codecs/rt5651/IN1-InternalMic.conf>
|
||||
<codecs/rt5651/IN3-HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
SectionVerb {
|
||||
EnableSequence [
|
||||
cdev "hw:bytcrrt5651"
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<rt5651/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/rt5651/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:bytcrrt5651"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
|
||||
Value {
|
||||
|
|
@ -20,8 +20,8 @@ SectionVerb {
|
|||
}
|
||||
}
|
||||
|
||||
<rt5651/MonoSpeaker.conf>
|
||||
<rt5651/HeadPhones-swapped.conf>
|
||||
<codecs/rt5651/MonoSpeaker.conf>
|
||||
<codecs/rt5651/HeadPhones-swapped.conf>
|
||||
|
||||
<rt5651/IN2-InternalMic.conf>
|
||||
<rt5651/IN3-HeadsetMic.conf>
|
||||
<codecs/rt5651/IN2-InternalMic.conf>
|
||||
<codecs/rt5651/IN3-HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
SectionVerb {
|
||||
EnableSequence [
|
||||
cdev "hw:bytcrrt5651"
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<rt5651/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/rt5651/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:bytcrrt5651"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
|
||||
Value {
|
||||
|
|
@ -20,8 +20,8 @@ SectionVerb {
|
|||
}
|
||||
}
|
||||
|
||||
<rt5651/MonoSpeaker.conf>
|
||||
<rt5651/HeadPhones.conf>
|
||||
<codecs/rt5651/MonoSpeaker.conf>
|
||||
<codecs/rt5651/HeadPhones.conf>
|
||||
|
||||
<rt5651/IN2-InternalMic.conf>
|
||||
<rt5651/IN3-HeadsetMic.conf>
|
||||
<codecs/rt5651/IN2-InternalMic.conf>
|
||||
<codecs/rt5651/IN3-HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
SectionVerb {
|
||||
EnableSequence [
|
||||
cdev "hw:bytcrrt5651"
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<rt5651/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/rt5651/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:bytcrrt5651"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
|
||||
Value {
|
||||
|
|
@ -20,8 +20,8 @@ SectionVerb {
|
|||
}
|
||||
}
|
||||
|
||||
<rt5651/Speaker.conf>
|
||||
<rt5651/HeadPhones.conf>
|
||||
<codecs/rt5651/Speaker.conf>
|
||||
<codecs/rt5651/HeadPhones.conf>
|
||||
|
||||
<rt5651/IN1-InternalMic.conf>
|
||||
<rt5651/IN3-HeadsetMic.conf>
|
||||
<codecs/rt5651/IN1-InternalMic.conf>
|
||||
<codecs/rt5651/IN3-HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
SectionVerb {
|
||||
EnableSequence [
|
||||
cdev "hw:bytcrrt5651"
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<rt5651/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/rt5651/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:bytcrrt5651"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
|
||||
Value {
|
||||
|
|
@ -20,8 +20,8 @@ SectionVerb {
|
|||
}
|
||||
}
|
||||
|
||||
<rt5651/Speaker.conf>
|
||||
<rt5651/HeadPhones.conf>
|
||||
<codecs/rt5651/Speaker.conf>
|
||||
<codecs/rt5651/HeadPhones.conf>
|
||||
|
||||
<rt5651/IN12-InternalMic.conf>
|
||||
<rt5651/IN3-HeadsetMic.conf>
|
||||
<codecs/rt5651/IN12-InternalMic.conf>
|
||||
<codecs/rt5651/IN3-HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
SectionVerb {
|
||||
EnableSequence [
|
||||
cdev "hw:bytcrrt5651"
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<rt5651/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/rt5651/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:bytcrrt5651"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
|
||||
Value {
|
||||
|
|
@ -20,8 +20,8 @@ SectionVerb {
|
|||
}
|
||||
}
|
||||
|
||||
<rt5651/Speaker.conf>
|
||||
<rt5651/HeadPhones.conf>
|
||||
<codecs/rt5651/Speaker.conf>
|
||||
<codecs/rt5651/HeadPhones.conf>
|
||||
|
||||
<rt5651/IN2-InternalMic.conf>
|
||||
<rt5651/IN3-HeadsetMic.conf>
|
||||
<codecs/rt5651/IN2-InternalMic.conf>
|
||||
<codecs/rt5651/IN3-HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
SectionVerb {
|
||||
EnableSequence [
|
||||
cdev "hw:bytcrrt5651"
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<rt5651/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/rt5651/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:bytcrrt5651"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
|
||||
Value {
|
||||
|
|
@ -20,11 +20,11 @@ SectionVerb {
|
|||
}
|
||||
}
|
||||
|
||||
<rt5651/Speaker.conf>
|
||||
<rt5651/MonoSpeaker.conf>
|
||||
<rt5651/HeadPhones.conf>
|
||||
<codecs/rt5651/Speaker.conf>
|
||||
<codecs/rt5651/MonoSpeaker.conf>
|
||||
<codecs/rt5651/HeadPhones.conf>
|
||||
|
||||
<rt5651/IN1-InternalMic.conf>
|
||||
<rt5651/IN2-InternalMic.conf>
|
||||
<rt5651/IN12-InternalMic.conf>
|
||||
<rt5651/IN3-HeadsetMic.conf>
|
||||
<codecs/rt5651/IN1-InternalMic.conf>
|
||||
<codecs/rt5651/IN2-InternalMic.conf>
|
||||
<codecs/rt5651/IN12-InternalMic.conf>
|
||||
<codecs/rt5651/IN3-HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -11,18 +11,18 @@ SectionVerb {
|
|||
|
||||
EnableSequence [
|
||||
cdev "hw:chtnau8824"
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<nau8824/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/nau8824/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:chtnau8824"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
}
|
||||
|
||||
<nau8824/Speaker.conf>
|
||||
<nau8824/HeadPhones.conf>
|
||||
<codecs/nau8824/Speaker.conf>
|
||||
<codecs/nau8824/HeadPhones.conf>
|
||||
|
||||
<nau8824/InternalMic.conf>
|
||||
<nau8824/HeadsetMic.conf>
|
||||
<codecs/nau8824/InternalMic.conf>
|
||||
<codecs/nau8824/HeadsetMic.conf>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
<searchdir:ucm>
|
||||
|
||||
SectionVerb {
|
||||
# ALSA PCM
|
||||
Value {
|
||||
|
|
@ -11,7 +13,7 @@ SectionVerb {
|
|||
EnableSequence [
|
||||
cdev "hw:chtrt5645"
|
||||
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
|
||||
# Output Configuration
|
||||
cset "name='DAC1 L Mux' IF1 DAC"
|
||||
|
|
|
|||
4
src/conf/ucm/codecs/Makefile.am
Normal file
4
src/conf/ucm/codecs/Makefile.am
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
SUBDIRS=\
|
||||
rt5640 \
|
||||
rt5651 \
|
||||
nau8824
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
alsaconfigdir = @ALSA_CONFIG_DIR@
|
||||
ucmdir = $(alsaconfigdir)/ucm/nau8824
|
||||
ucmdir = $(alsaconfigdir)/ucm/codecs/nau8824
|
||||
ucm_DATA = EnableSeq.conf HeadPhones.conf HeadsetMic.conf InternalMic.conf \
|
||||
MonoSpeaker.conf Speaker.conf
|
||||
EXTRA_DIST = $(ucm_DATA)
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
alsaconfigdir = @ALSA_CONFIG_DIR@
|
||||
ucmdir = $(alsaconfigdir)/ucm/rt5640
|
||||
ucmdir = $(alsaconfigdir)/ucm/codecs/rt5640
|
||||
ucm_DATA = DigitalMics.conf EnableSeq.conf HeadPhones.conf HeadsetMic.conf \
|
||||
IN1-InternalMic.conf IN3-InternalMic.conf MonoSpeaker.conf Speaker.conf
|
||||
EXTRA_DIST = $(ucm_DATA)
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
alsaconfigdir = @ALSA_CONFIG_DIR@
|
||||
ucmdir = $(alsaconfigdir)/ucm/rt5651
|
||||
ucmdir = $(alsaconfigdir)/ucm/codecs/rt5651
|
||||
ucm_DATA = EnableSeq.conf HeadPhones.conf HeadPhones-swapped.conf \
|
||||
IN1-InternalMic.conf IN2-InternalMic.conf IN12-InternalMic.conf \
|
||||
IN3-HeadsetMic.conf Speaker.conf MonoSpeaker.conf
|
||||
|
|
@ -11,18 +11,18 @@ SectionVerb {
|
|||
|
||||
EnableSequence [
|
||||
cdev "hw:chtnau8824"
|
||||
<bytcr/PlatformEnableSeq.conf>
|
||||
<nau8824/EnableSeq.conf>
|
||||
<platforms/bytcr/PlatformEnableSeq.conf>
|
||||
<codecs/nau8824/EnableSeq.conf>
|
||||
]
|
||||
|
||||
DisableSequence [
|
||||
cdev "hw:chtnau8824"
|
||||
<bytcr/PlatformDisableSeq.conf>
|
||||
<platforms/bytcr/PlatformDisableSeq.conf>
|
||||
]
|
||||
}
|
||||
|
||||
<nau8824/MonoSpeaker.conf>
|
||||
<nau8824/HeadPhones.conf>
|
||||
<codecs/nau8824/MonoSpeaker.conf>
|
||||
<codecs/nau8824/HeadPhones.conf>
|
||||
|
||||
<nau8824/InternalMic.conf>
|
||||
<nau8824/HeadsetMic.conf>
|
||||
<codecs/nau8824/InternalMic.conf>
|
||||
<codecs/nau8824/HeadsetMic.conf>
|
||||
|
|
|
|||
2
src/conf/ucm/platforms/Makefile.am
Normal file
2
src/conf/ucm/platforms/Makefile.am
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
SUBDIRS=\
|
||||
bytcr
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
alsaconfigdir = @ALSA_CONFIG_DIR@
|
||||
ucmdir = $(alsaconfigdir)/ucm/bytcr
|
||||
ucmdir = $(alsaconfigdir)/ucm/platforms/bytcr
|
||||
ucm_DATA = PlatformEnableSeq.conf PlatformDisableSeq.conf
|
||||
EXTRA_DIST = $(ucm_DATA)
|
||||
|
|
@ -53,6 +53,7 @@
|
|||
static const char * const component_dir[] = {
|
||||
"codecs", /* for off-soc codecs */
|
||||
"dsps", /* for DSPs embedded in SoC */
|
||||
"platforms", /* for common platform implementations */
|
||||
NULL, /* terminator */
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue