diff --git a/configure.ac b/configure.ac index 4c9d860f..d0cab2d6 100644 --- a/configure.ac +++ b/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 \ diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index 7cdc6176..85c15090 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -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 \ diff --git a/src/conf/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf b/src/conf/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf index 799163db..facc73ac 100644 --- a/src/conf/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf +++ b/src/conf/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf @@ -11,18 +11,18 @@ SectionVerb { EnableSequence [ cdev "hw:chtnau8824" - - + + ] DisableSequence [ cdev "hw:chtnau8824" - + ] } - - + + - - + + diff --git a/src/conf/ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf b/src/conf/ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf index 938b3592..c78cdfb8 100644 --- a/src/conf/ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf +++ b/src/conf/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/src/conf/ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf b/src/conf/ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf index f36b245e..34a5d53d 100644 --- a/src/conf/ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf +++ b/src/conf/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/src/conf/ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf b/src/conf/ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf index 1a08eded..0aa0c026 100644 --- a/src/conf/ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf +++ b/src/conf/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/src/conf/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf b/src/conf/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf index 4587b2e1..e358d4f2 100644 --- a/src/conf/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf +++ b/src/conf/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/src/conf/ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf b/src/conf/ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf index decd3960..097560d0 100644 --- a/src/conf/ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf +++ b/src/conf/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/src/conf/ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf b/src/conf/ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf index d243bf82..8a018f63 100644 --- a/src/conf/ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf +++ b/src/conf/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/src/conf/ucm/bytcr-rt5640/HiFi.conf b/src/conf/ucm/bytcr-rt5640/HiFi.conf index c833fe74..20ebe2dd 100644 --- a/src/conf/ucm/bytcr-rt5640/HiFi.conf +++ b/src/conf/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/src/conf/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf b/src/conf/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf index dd5b35fc..ca8a7d90 100644 --- a/src/conf/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf +++ b/src/conf/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/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf b/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf index 777ed783..60ef6b33 100644 --- a/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf +++ b/src/conf/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/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf b/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf index 9f56c077..e75210d4 100644 --- a/src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf +++ b/src/conf/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/src/conf/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf b/src/conf/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf index e2a579ab..2b7675bc 100644 --- a/src/conf/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf +++ b/src/conf/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/src/conf/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf b/src/conf/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf index ae52e719..7a8c94bc 100644 --- a/src/conf/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf +++ b/src/conf/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/src/conf/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf b/src/conf/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf index a73ff5f8..45c7837c 100644 --- a/src/conf/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf +++ b/src/conf/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/src/conf/ucm/bytcr-rt5651/HiFi.conf b/src/conf/ucm/bytcr-rt5651/HiFi.conf index 8733403c..d3928e9b 100644 --- a/src/conf/ucm/bytcr-rt5651/HiFi.conf +++ b/src/conf/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/src/conf/ucm/chtnau8824/HiFi.conf b/src/conf/ucm/chtnau8824/HiFi.conf index dc52800e..97a7ac7b 100644 --- a/src/conf/ucm/chtnau8824/HiFi.conf +++ b/src/conf/ucm/chtnau8824/HiFi.conf @@ -11,18 +11,18 @@ SectionVerb { EnableSequence [ cdev "hw:chtnau8824" - - + + ] DisableSequence [ cdev "hw:chtnau8824" - + ] } - - + + - - + + diff --git a/src/conf/ucm/chtrt5645/HiFi.conf b/src/conf/ucm/chtrt5645/HiFi.conf index d993f6ae..6a3c6875 100644 --- a/src/conf/ucm/chtrt5645/HiFi.conf +++ b/src/conf/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/src/conf/ucm/codecs/Makefile.am b/src/conf/ucm/codecs/Makefile.am new file mode 100644 index 00000000..2b374acb --- /dev/null +++ b/src/conf/ucm/codecs/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS=\ +rt5640 \ +rt5651 \ +nau8824 diff --git a/src/conf/ucm/nau8824/EnableSeq.conf b/src/conf/ucm/codecs/nau8824/EnableSeq.conf similarity index 100% rename from src/conf/ucm/nau8824/EnableSeq.conf rename to src/conf/ucm/codecs/nau8824/EnableSeq.conf diff --git a/src/conf/ucm/nau8824/HeadPhones.conf b/src/conf/ucm/codecs/nau8824/HeadPhones.conf similarity index 100% rename from src/conf/ucm/nau8824/HeadPhones.conf rename to src/conf/ucm/codecs/nau8824/HeadPhones.conf diff --git a/src/conf/ucm/nau8824/HeadsetMic.conf b/src/conf/ucm/codecs/nau8824/HeadsetMic.conf similarity index 100% rename from src/conf/ucm/nau8824/HeadsetMic.conf rename to src/conf/ucm/codecs/nau8824/HeadsetMic.conf diff --git a/src/conf/ucm/nau8824/InternalMic.conf b/src/conf/ucm/codecs/nau8824/InternalMic.conf similarity index 100% rename from src/conf/ucm/nau8824/InternalMic.conf rename to src/conf/ucm/codecs/nau8824/InternalMic.conf diff --git a/src/conf/ucm/nau8824/Makefile.am b/src/conf/ucm/codecs/nau8824/Makefile.am similarity index 79% rename from src/conf/ucm/nau8824/Makefile.am rename to src/conf/ucm/codecs/nau8824/Makefile.am index b39b8bb4..fd3bafe1 100644 --- a/src/conf/ucm/nau8824/Makefile.am +++ b/src/conf/ucm/codecs/nau8824/Makefile.am @@ -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) diff --git a/src/conf/ucm/nau8824/MonoSpeaker.conf b/src/conf/ucm/codecs/nau8824/MonoSpeaker.conf similarity index 100% rename from src/conf/ucm/nau8824/MonoSpeaker.conf rename to src/conf/ucm/codecs/nau8824/MonoSpeaker.conf diff --git a/src/conf/ucm/nau8824/Speaker.conf b/src/conf/ucm/codecs/nau8824/Speaker.conf similarity index 100% rename from src/conf/ucm/nau8824/Speaker.conf rename to src/conf/ucm/codecs/nau8824/Speaker.conf diff --git a/src/conf/ucm/rt5640/DigitalMics.conf b/src/conf/ucm/codecs/rt5640/DigitalMics.conf similarity index 100% rename from src/conf/ucm/rt5640/DigitalMics.conf rename to src/conf/ucm/codecs/rt5640/DigitalMics.conf diff --git a/src/conf/ucm/rt5640/EnableSeq.conf b/src/conf/ucm/codecs/rt5640/EnableSeq.conf similarity index 100% rename from src/conf/ucm/rt5640/EnableSeq.conf rename to src/conf/ucm/codecs/rt5640/EnableSeq.conf diff --git a/src/conf/ucm/rt5640/HeadPhones.conf b/src/conf/ucm/codecs/rt5640/HeadPhones.conf similarity index 100% rename from src/conf/ucm/rt5640/HeadPhones.conf rename to src/conf/ucm/codecs/rt5640/HeadPhones.conf diff --git a/src/conf/ucm/rt5640/HeadsetMic.conf b/src/conf/ucm/codecs/rt5640/HeadsetMic.conf similarity index 100% rename from src/conf/ucm/rt5640/HeadsetMic.conf rename to src/conf/ucm/codecs/rt5640/HeadsetMic.conf diff --git a/src/conf/ucm/rt5640/IN1-InternalMic.conf b/src/conf/ucm/codecs/rt5640/IN1-InternalMic.conf similarity index 100% rename from src/conf/ucm/rt5640/IN1-InternalMic.conf rename to src/conf/ucm/codecs/rt5640/IN1-InternalMic.conf diff --git a/src/conf/ucm/rt5640/IN3-InternalMic.conf b/src/conf/ucm/codecs/rt5640/IN3-InternalMic.conf similarity index 100% rename from src/conf/ucm/rt5640/IN3-InternalMic.conf rename to src/conf/ucm/codecs/rt5640/IN3-InternalMic.conf diff --git a/src/conf/ucm/rt5640/Makefile.am b/src/conf/ucm/codecs/rt5640/Makefile.am similarity index 82% rename from src/conf/ucm/rt5640/Makefile.am rename to src/conf/ucm/codecs/rt5640/Makefile.am index a6fbdc57..80fa8cfc 100644 --- a/src/conf/ucm/rt5640/Makefile.am +++ b/src/conf/ucm/codecs/rt5640/Makefile.am @@ -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) diff --git a/src/conf/ucm/rt5640/MonoSpeaker.conf b/src/conf/ucm/codecs/rt5640/MonoSpeaker.conf similarity index 100% rename from src/conf/ucm/rt5640/MonoSpeaker.conf rename to src/conf/ucm/codecs/rt5640/MonoSpeaker.conf diff --git a/src/conf/ucm/rt5640/Speaker.conf b/src/conf/ucm/codecs/rt5640/Speaker.conf similarity index 100% rename from src/conf/ucm/rt5640/Speaker.conf rename to src/conf/ucm/codecs/rt5640/Speaker.conf diff --git a/src/conf/ucm/rt5651/EnableSeq.conf b/src/conf/ucm/codecs/rt5651/EnableSeq.conf similarity index 100% rename from src/conf/ucm/rt5651/EnableSeq.conf rename to src/conf/ucm/codecs/rt5651/EnableSeq.conf diff --git a/src/conf/ucm/rt5651/HeadPhones-swapped.conf b/src/conf/ucm/codecs/rt5651/HeadPhones-swapped.conf similarity index 100% rename from src/conf/ucm/rt5651/HeadPhones-swapped.conf rename to src/conf/ucm/codecs/rt5651/HeadPhones-swapped.conf diff --git a/src/conf/ucm/rt5651/HeadPhones.conf b/src/conf/ucm/codecs/rt5651/HeadPhones.conf similarity index 100% rename from src/conf/ucm/rt5651/HeadPhones.conf rename to src/conf/ucm/codecs/rt5651/HeadPhones.conf diff --git a/src/conf/ucm/rt5651/IN1-InternalMic.conf b/src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf similarity index 100% rename from src/conf/ucm/rt5651/IN1-InternalMic.conf rename to src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf diff --git a/src/conf/ucm/rt5651/IN12-InternalMic.conf b/src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf similarity index 100% rename from src/conf/ucm/rt5651/IN12-InternalMic.conf rename to src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf diff --git a/src/conf/ucm/rt5651/IN2-InternalMic.conf b/src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf similarity index 100% rename from src/conf/ucm/rt5651/IN2-InternalMic.conf rename to src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf diff --git a/src/conf/ucm/rt5651/IN3-HeadsetMic.conf b/src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf similarity index 100% rename from src/conf/ucm/rt5651/IN3-HeadsetMic.conf rename to src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf diff --git a/src/conf/ucm/rt5651/Makefile.am b/src/conf/ucm/codecs/rt5651/Makefile.am similarity index 85% rename from src/conf/ucm/rt5651/Makefile.am rename to src/conf/ucm/codecs/rt5651/Makefile.am index acc8ea49..a68bd7bb 100644 --- a/src/conf/ucm/rt5651/Makefile.am +++ b/src/conf/ucm/codecs/rt5651/Makefile.am @@ -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 diff --git a/src/conf/ucm/rt5651/MonoSpeaker.conf b/src/conf/ucm/codecs/rt5651/MonoSpeaker.conf similarity index 100% rename from src/conf/ucm/rt5651/MonoSpeaker.conf rename to src/conf/ucm/codecs/rt5651/MonoSpeaker.conf diff --git a/src/conf/ucm/rt5651/Speaker.conf b/src/conf/ucm/codecs/rt5651/Speaker.conf similarity index 100% rename from src/conf/ucm/rt5651/Speaker.conf rename to src/conf/ucm/codecs/rt5651/Speaker.conf diff --git a/src/conf/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf b/src/conf/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf index 799163db..facc73ac 100644 --- a/src/conf/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf +++ b/src/conf/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf @@ -11,18 +11,18 @@ SectionVerb { EnableSequence [ cdev "hw:chtnau8824" - - + + ] DisableSequence [ cdev "hw:chtnau8824" - + ] } - - + + - - + + diff --git a/src/conf/ucm/platforms/Makefile.am b/src/conf/ucm/platforms/Makefile.am new file mode 100644 index 00000000..1bf252f0 --- /dev/null +++ b/src/conf/ucm/platforms/Makefile.am @@ -0,0 +1,2 @@ +SUBDIRS=\ +bytcr diff --git a/src/conf/ucm/bytcr/Makefile.am b/src/conf/ucm/platforms/bytcr/Makefile.am similarity index 71% rename from src/conf/ucm/bytcr/Makefile.am rename to src/conf/ucm/platforms/bytcr/Makefile.am index f7a54cbd..c53b2143 100644 --- a/src/conf/ucm/bytcr/Makefile.am +++ b/src/conf/ucm/platforms/bytcr/Makefile.am @@ -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) diff --git a/src/conf/ucm/bytcr/PlatformDisableSeq.conf b/src/conf/ucm/platforms/bytcr/PlatformDisableSeq.conf similarity index 100% rename from src/conf/ucm/bytcr/PlatformDisableSeq.conf rename to src/conf/ucm/platforms/bytcr/PlatformDisableSeq.conf diff --git a/src/conf/ucm/bytcr/PlatformEnableSeq.conf b/src/conf/ucm/platforms/bytcr/PlatformEnableSeq.conf similarity index 100% rename from src/conf/ucm/bytcr/PlatformEnableSeq.conf rename to src/conf/ucm/platforms/bytcr/PlatformEnableSeq.conf diff --git a/src/ucm/parser.c b/src/ucm/parser.c index 219edb96..2b6f1159 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -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 */ };