From: Takashi Iwai Date: Tue, 27 Nov 2018 12:55:04 +0000 (+0100) Subject: conf: Move UCM profile snippets into components subdirectory X-Git-Tag: v1.2.1~67 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=ae3d8b79afc804fc3c5506f771fd93682d7e45df;p=alsa-ucm-conf.git 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 Acked-by: Jaroslav Kysela Reviewed-by: Hans de Goede Tested-by: Hans de Goede Signed-off-by: Takashi Iwai --- diff --git a/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf b/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf index 799163d..facc73a 100644 --- a/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf +++ b/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf @@ -11,18 +11,18 @@ SectionVerb { EnableSequence [ cdev "hw:chtnau8824" - - + + ] DisableSequence [ cdev "hw:chtnau8824" - + ] } - - + + - - + + diff --git a/ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf b/ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf index 938b359..c78cdfb 100644 --- a/ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf +++ b/ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf @@ -6,13 +6,13 @@ SectionVerb { EnableSequence [ cdev "hw:bytcrrt5640" - - + + ] DisableSequence [ cdev "hw:bytcrrt5640" - + ] Value { @@ -21,8 +21,8 @@ SectionVerb { } } - - + + - - + + diff --git a/ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf b/ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf index f36b245..34a5d53 100644 --- a/ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf +++ b/ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf @@ -6,13 +6,13 @@ SectionVerb { EnableSequence [ cdev "hw:bytcrrt5640" - - + + ] DisableSequence [ cdev "hw:bytcrrt5640" - + ] Value { @@ -21,8 +21,8 @@ SectionVerb { } } - - + + - - + + diff --git a/ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf b/ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf index 1a08ede..0aa0c02 100644 --- a/ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf +++ b/ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf @@ -6,13 +6,13 @@ SectionVerb { EnableSequence [ cdev "hw:bytcrrt5640" - - + + ] DisableSequence [ cdev "hw:bytcrrt5640" - + ] Value { @@ -21,8 +21,8 @@ SectionVerb { } } - - + + - - + + diff --git a/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf b/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf index 4587b2e..e358d4f 100644 --- a/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf +++ b/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf @@ -6,13 +6,13 @@ SectionVerb { EnableSequence [ cdev "hw:bytcrrt5640" - - + + ] DisableSequence [ cdev "hw:bytcrrt5640" - + ] Value { @@ -21,8 +21,8 @@ SectionVerb { } } - - + + - - + + diff --git a/ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf b/ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf index decd396..097560d 100644 --- a/ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf +++ b/ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf @@ -6,13 +6,13 @@ SectionVerb { EnableSequence [ cdev "hw:bytcrrt5640" - - + + ] DisableSequence [ cdev "hw:bytcrrt5640" - + ] Value { @@ -21,8 +21,8 @@ SectionVerb { } } - - + + - - + + diff --git a/ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf b/ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf index d243bf8..8a018f6 100644 --- a/ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf +++ b/ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf @@ -6,13 +6,13 @@ SectionVerb { EnableSequence [ cdev "hw:bytcrrt5640" - - + + ] DisableSequence [ cdev "hw:bytcrrt5640" - + ] Value { @@ -21,8 +21,8 @@ SectionVerb { } } - - + + - - + + diff --git a/ucm/bytcr-rt5640/HiFi.conf b/ucm/bytcr-rt5640/HiFi.conf index c833fe7..20ebe2d 100644 --- a/ucm/bytcr-rt5640/HiFi.conf +++ b/ucm/bytcr-rt5640/HiFi.conf @@ -6,13 +6,13 @@ SectionVerb { EnableSequence [ cdev "hw:bytcrrt5640" - - + + ] DisableSequence [ cdev "hw:bytcrrt5640" - + ] Value { @@ -21,11 +21,11 @@ SectionVerb { } } - - - + + + - - - - + + + + diff --git a/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf b/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf index dd5b35f..ca8a7d9 100644 --- a/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf +++ b/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf @@ -5,13 +5,13 @@ SectionVerb { EnableSequence [ cdev "hw:bytcrrt5651" - - + + ] DisableSequence [ cdev "hw:bytcrrt5651" - + ] Value { @@ -20,8 +20,8 @@ SectionVerb { } } - - + + - - + + diff --git a/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf b/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf index 777ed78..60ef6b3 100644 --- a/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf +++ b/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf @@ -5,13 +5,13 @@ SectionVerb { EnableSequence [ cdev "hw:bytcrrt5651" - - + + ] DisableSequence [ cdev "hw:bytcrrt5651" - + ] Value { @@ -20,8 +20,8 @@ SectionVerb { } } - - + + - - + + diff --git a/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf b/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf index 9f56c07..e75210d 100644 --- a/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf +++ b/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf @@ -5,13 +5,13 @@ SectionVerb { EnableSequence [ cdev "hw:bytcrrt5651" - - + + ] DisableSequence [ cdev "hw:bytcrrt5651" - + ] Value { @@ -20,8 +20,8 @@ SectionVerb { } } - - + + - - + + diff --git a/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf b/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf index e2a579a..2b7675b 100644 --- a/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf +++ b/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf @@ -5,13 +5,13 @@ SectionVerb { EnableSequence [ cdev "hw:bytcrrt5651" - - + + ] DisableSequence [ cdev "hw:bytcrrt5651" - + ] Value { @@ -20,8 +20,8 @@ SectionVerb { } } - - + + - - + + diff --git a/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf b/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf index ae52e71..7a8c94b 100644 --- a/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf +++ b/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf @@ -5,13 +5,13 @@ SectionVerb { EnableSequence [ cdev "hw:bytcrrt5651" - - + + ] DisableSequence [ cdev "hw:bytcrrt5651" - + ] Value { @@ -20,8 +20,8 @@ SectionVerb { } } - - + + - - + + diff --git a/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf b/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf index a73ff5f..45c7837 100644 --- a/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf +++ b/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf @@ -5,13 +5,13 @@ SectionVerb { EnableSequence [ cdev "hw:bytcrrt5651" - - + + ] DisableSequence [ cdev "hw:bytcrrt5651" - + ] Value { @@ -20,8 +20,8 @@ SectionVerb { } } - - + + - - + + diff --git a/ucm/bytcr-rt5651/HiFi.conf b/ucm/bytcr-rt5651/HiFi.conf index 8733403..d3928e9 100644 --- a/ucm/bytcr-rt5651/HiFi.conf +++ b/ucm/bytcr-rt5651/HiFi.conf @@ -5,13 +5,13 @@ SectionVerb { EnableSequence [ cdev "hw:bytcrrt5651" - - + + ] DisableSequence [ cdev "hw:bytcrrt5651" - + ] Value { @@ -20,11 +20,11 @@ SectionVerb { } } - - - + + + - - - - + + + + diff --git a/ucm/chtnau8824/HiFi.conf b/ucm/chtnau8824/HiFi.conf index dc52800..97a7ac7 100644 --- a/ucm/chtnau8824/HiFi.conf +++ b/ucm/chtnau8824/HiFi.conf @@ -11,18 +11,18 @@ SectionVerb { EnableSequence [ cdev "hw:chtnau8824" - - + + ] DisableSequence [ cdev "hw:chtnau8824" - + ] } - - + + - - + + diff --git a/ucm/chtrt5645/HiFi.conf b/ucm/chtrt5645/HiFi.conf index d993f6a..6a3c687 100644 --- a/ucm/chtrt5645/HiFi.conf +++ b/ucm/chtrt5645/HiFi.conf @@ -1,3 +1,5 @@ + + SectionVerb { # ALSA PCM Value { @@ -11,7 +13,7 @@ SectionVerb { EnableSequence [ cdev "hw:chtrt5645" - + # Output Configuration cset "name='DAC1 L Mux' IF1 DAC" diff --git a/ucm/nau8824/EnableSeq.conf b/ucm/codecs/nau8824/EnableSeq.conf similarity index 100% rename from ucm/nau8824/EnableSeq.conf rename to ucm/codecs/nau8824/EnableSeq.conf diff --git a/ucm/nau8824/HeadPhones.conf b/ucm/codecs/nau8824/HeadPhones.conf similarity index 100% rename from ucm/nau8824/HeadPhones.conf rename to ucm/codecs/nau8824/HeadPhones.conf diff --git a/ucm/nau8824/HeadsetMic.conf b/ucm/codecs/nau8824/HeadsetMic.conf similarity index 100% rename from ucm/nau8824/HeadsetMic.conf rename to ucm/codecs/nau8824/HeadsetMic.conf diff --git a/ucm/nau8824/InternalMic.conf b/ucm/codecs/nau8824/InternalMic.conf similarity index 100% rename from ucm/nau8824/InternalMic.conf rename to ucm/codecs/nau8824/InternalMic.conf diff --git a/ucm/nau8824/MonoSpeaker.conf b/ucm/codecs/nau8824/MonoSpeaker.conf similarity index 100% rename from ucm/nau8824/MonoSpeaker.conf rename to ucm/codecs/nau8824/MonoSpeaker.conf diff --git a/ucm/nau8824/Speaker.conf b/ucm/codecs/nau8824/Speaker.conf similarity index 100% rename from ucm/nau8824/Speaker.conf rename to ucm/codecs/nau8824/Speaker.conf diff --git a/ucm/rt5640/DigitalMics.conf b/ucm/codecs/rt5640/DigitalMics.conf similarity index 100% rename from ucm/rt5640/DigitalMics.conf rename to ucm/codecs/rt5640/DigitalMics.conf diff --git a/ucm/rt5640/EnableSeq.conf b/ucm/codecs/rt5640/EnableSeq.conf similarity index 100% rename from ucm/rt5640/EnableSeq.conf rename to ucm/codecs/rt5640/EnableSeq.conf diff --git a/ucm/rt5640/HeadPhones.conf b/ucm/codecs/rt5640/HeadPhones.conf similarity index 100% rename from ucm/rt5640/HeadPhones.conf rename to ucm/codecs/rt5640/HeadPhones.conf diff --git a/ucm/rt5640/HeadsetMic.conf b/ucm/codecs/rt5640/HeadsetMic.conf similarity index 100% rename from ucm/rt5640/HeadsetMic.conf rename to ucm/codecs/rt5640/HeadsetMic.conf diff --git a/ucm/rt5640/IN1-InternalMic.conf b/ucm/codecs/rt5640/IN1-InternalMic.conf similarity index 100% rename from ucm/rt5640/IN1-InternalMic.conf rename to ucm/codecs/rt5640/IN1-InternalMic.conf diff --git a/ucm/rt5640/IN3-InternalMic.conf b/ucm/codecs/rt5640/IN3-InternalMic.conf similarity index 100% rename from ucm/rt5640/IN3-InternalMic.conf rename to ucm/codecs/rt5640/IN3-InternalMic.conf diff --git a/ucm/rt5640/MonoSpeaker.conf b/ucm/codecs/rt5640/MonoSpeaker.conf similarity index 100% rename from ucm/rt5640/MonoSpeaker.conf rename to ucm/codecs/rt5640/MonoSpeaker.conf diff --git a/ucm/rt5640/Speaker.conf b/ucm/codecs/rt5640/Speaker.conf similarity index 100% rename from ucm/rt5640/Speaker.conf rename to ucm/codecs/rt5640/Speaker.conf diff --git a/ucm/rt5651/EnableSeq.conf b/ucm/codecs/rt5651/EnableSeq.conf similarity index 100% rename from ucm/rt5651/EnableSeq.conf rename to ucm/codecs/rt5651/EnableSeq.conf diff --git a/ucm/rt5651/HeadPhones-swapped.conf b/ucm/codecs/rt5651/HeadPhones-swapped.conf similarity index 100% rename from ucm/rt5651/HeadPhones-swapped.conf rename to ucm/codecs/rt5651/HeadPhones-swapped.conf diff --git a/ucm/rt5651/HeadPhones.conf b/ucm/codecs/rt5651/HeadPhones.conf similarity index 100% rename from ucm/rt5651/HeadPhones.conf rename to ucm/codecs/rt5651/HeadPhones.conf diff --git a/ucm/rt5651/IN1-InternalMic.conf b/ucm/codecs/rt5651/IN1-InternalMic.conf similarity index 100% rename from ucm/rt5651/IN1-InternalMic.conf rename to ucm/codecs/rt5651/IN1-InternalMic.conf diff --git a/ucm/rt5651/IN12-InternalMic.conf b/ucm/codecs/rt5651/IN12-InternalMic.conf similarity index 100% rename from ucm/rt5651/IN12-InternalMic.conf rename to ucm/codecs/rt5651/IN12-InternalMic.conf diff --git a/ucm/rt5651/IN2-InternalMic.conf b/ucm/codecs/rt5651/IN2-InternalMic.conf similarity index 100% rename from ucm/rt5651/IN2-InternalMic.conf rename to ucm/codecs/rt5651/IN2-InternalMic.conf diff --git a/ucm/rt5651/IN3-HeadsetMic.conf b/ucm/codecs/rt5651/IN3-HeadsetMic.conf similarity index 100% rename from ucm/rt5651/IN3-HeadsetMic.conf rename to ucm/codecs/rt5651/IN3-HeadsetMic.conf diff --git a/ucm/rt5651/MonoSpeaker.conf b/ucm/codecs/rt5651/MonoSpeaker.conf similarity index 100% rename from ucm/rt5651/MonoSpeaker.conf rename to ucm/codecs/rt5651/MonoSpeaker.conf diff --git a/ucm/rt5651/Speaker.conf b/ucm/codecs/rt5651/Speaker.conf similarity index 100% rename from ucm/rt5651/Speaker.conf rename to ucm/codecs/rt5651/Speaker.conf diff --git a/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf b/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf index 799163d..facc73a 100644 --- a/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf +++ b/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf @@ -11,18 +11,18 @@ SectionVerb { EnableSequence [ cdev "hw:chtnau8824" - - + + ] DisableSequence [ cdev "hw:chtnau8824" - + ] } - - + + - - + + diff --git a/ucm/bytcr/PlatformDisableSeq.conf b/ucm/platforms/bytcr/PlatformDisableSeq.conf similarity index 100% rename from ucm/bytcr/PlatformDisableSeq.conf rename to ucm/platforms/bytcr/PlatformDisableSeq.conf diff --git a/ucm/bytcr/PlatformEnableSeq.conf b/ucm/platforms/bytcr/PlatformEnableSeq.conf similarity index 100% rename from ucm/bytcr/PlatformEnableSeq.conf rename to ucm/platforms/bytcr/PlatformEnableSeq.conf