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>

diff --git a/configure.ac b/configure.ac
index 4c9d860fd0e576405aec9ca784ec82d9172bc08c..d0cab2d6cf785d6a3b0157026add95467c6cfe73 100644 (file)
--- 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 7cdc6176584a1bd0750897e7cb62df00f0ba21f2..85c15090951d4106a8e425134b26613b9c2b1377 100644 (file)
--- 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 799163dbe481c19ee1843669ae90b708294cf826..facc73ac3b2bfa322091e1acc1501906b2e259d2 100644 (file)
--- 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"
-               <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>

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 938b359290d418222c965ad854cf64ea7d96f382..c78cdfb80a443b1d1721bd83e2af82eed1ef94b4 100644 (file)
--- 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"
 
-               <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>

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 f36b245e5092941126ed17dc6502b50820bdd40b..34a5d53d363c6bd7bc0b9e2f501fbb1479d99320 100644 (file)
--- 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"
 
-               <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>

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 1a08ededc40c7c5cefb2d1531fdd64a291418b08..0aa0c0266412f4a883c4c2753ab122d384c6a5f2 100644 (file)
--- 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"
 
-               <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>

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 4587b2e1294ed34f6048a60081c8360395181a26..e358d4f23f12b94c214071690ae84b5419f2ee5b 100644 (file)
--- 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"
 
-               <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>

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 decd396047aa5a3096b335eac7742ce2ccdd6fb2..097560d02d120c468b3a4e32313049490e3225dc 100644 (file)
--- 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"
 
-               <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>

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 d243bf823511118a609a2043522d309dd2ff95a1..8a018f63c9c6201fed8d6dcf228e620527b8852b 100644 (file)
--- 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"
 
-               <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>

diff --git a/src/conf/ucm/bytcr-rt5640/HiFi.conf b/src/conf/ucm/bytcr-rt5640/HiFi.conf
index c833fe74845b63399c9eb00374c1059166b375c7..20ebe2dd36e28dffe4efd8acfddc2b0e0b1248f9 100644 (file)
--- 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"
 
-               <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>

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 dd5b35fc02cb256c7de501ad5e5c0e02d042b71e..ca8a7d9078fb79c8613278b7774eceb70742a730 100644 (file)
--- 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"
-               <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>

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 777ed7836ee5602114f4bc2bc4f441b8e13fc9ad..60ef6b332ea2ac34bd7a7a0c93641cdd4470cf76 100644 (file)
--- 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"
-               <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>

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 9f56c077b65a6758145dc245b798c53584520482..e75210d4aa7e6fbbc2bdeea96abb464bfb049cae 100644 (file)
--- 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"
-               <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>

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 e2a579ab22611be68bedbfe2616d0b7d604b6647..2b7675bce8315b979a857851ea28247010b917fa 100644 (file)
--- 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"
-               <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>

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 ae52e719611092e7c274c9419d2cc5d2b3494d2a..7a8c94bc5d6bc7112bb6273e8f9348cbe8c6fc50 100644 (file)
--- 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"
-               <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>

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 a73ff5f86b8f801811a7951adfe057d362c97406..45c7837c6fb97d8b33c4b33c36dd5eb6da8e2158 100644 (file)
--- 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"
-               <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>

diff --git a/src/conf/ucm/bytcr-rt5651/HiFi.conf b/src/conf/ucm/bytcr-rt5651/HiFi.conf
index 8733403cf28d5d90e21ef2b7962275a932406605..d3928e9b9976053c9f38ec13907abdedaa7fda1f 100644 (file)
--- 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"
-               <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>

diff --git a/src/conf/ucm/chtnau8824/HiFi.conf b/src/conf/ucm/chtnau8824/HiFi.conf
index dc52800e5eaa82acdffd9f091b94321dfe6eeb87..97a7ac7ba366365f9f188fcdea8176666f7ebe5d 100644 (file)
--- a/src/conf/ucm/chtnau8824/HiFi.conf
+++ b/src/conf/ucm/chtnau8824/HiFi.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>

diff --git a/src/conf/ucm/chtrt5645/HiFi.conf b/src/conf/ucm/chtrt5645/HiFi.conf
index d993f6ae99291a6cafd68b9a2f9ada5ee6afc66a..6a3c6875f301a16ec6720469ba7b1316bba501b5 100644 (file)
--- a/src/conf/ucm/chtrt5645/HiFi.conf
+++ b/src/conf/ucm/chtrt5645/HiFi.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"

diff --git a/src/conf/ucm/codecs/Makefile.am b/src/conf/ucm/codecs/Makefile.am
new file mode 100644 (file)
index 0000000..2b374ac
--- /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 b39b8bb4c93408912ef8013fad1972acbd75ab06..fd3bafe135b77433834b95b432d4c44f213820f7 100644 (file)
--- 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 a6fbdc572529953fd2d72517b5c84637745f1ce4..80fa8cfc758c5723da7a7268873d5cadce03fb44 100644 (file)
--- 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 acc8ea491043c159db40824dd167a922ed8502d7..a68bd7bb9fcfd74158309a26d2dd07537208e44b 100644 (file)
--- 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 799163dbe481c19ee1843669ae90b708294cf826..facc73ac3b2bfa322091e1acc1501906b2e259d2 100644 (file)
--- 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"
-               <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>

diff --git a/src/conf/ucm/platforms/Makefile.am b/src/conf/ucm/platforms/Makefile.am
new file mode 100644 (file)
index 0000000..1bf252f
--- /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 f7a54cbdedcd7f90af4fb41499fc9e70865ac779..c53b21438ad2449ef3d0b79b64e5843fd5b3686b 100644 (file)
--- 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 219edb9691a6bbf04b062766464a267de58f053c..2b6f1159aa7df6211c36e2caa50da3d2d55be6dc 100644 (file)
--- 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 */
 };