conf: Move UCM profile snippets into components subdirectory
authorTakashi Iwai <tiwai@suse.de>
Tue, 27 Nov 2018 12:55:04 +0000 (13:55 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 28 Nov 2018 17:21:14 +0000 (18:21 +0100)
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>

52 files changed:
configure.ac
src/conf/ucm/Makefile.am
src/conf/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf
src/conf/ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf
src/conf/ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf
src/conf/ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf
src/conf/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf
src/conf/ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf
src/conf/ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf
src/conf/ucm/bytcr-rt5640/HiFi.conf
src/conf/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf
src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf
src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf
src/conf/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf
src/conf/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf
src/conf/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf
src/conf/ucm/bytcr-rt5651/HiFi.conf
src/conf/ucm/chtnau8824/HiFi.conf
src/conf/ucm/chtrt5645/HiFi.conf
src/conf/ucm/codecs/Makefile.am [new file with mode: 0644]
src/conf/ucm/codecs/nau8824/EnableSeq.conf [moved from src/conf/ucm/nau8824/EnableSeq.conf with 100% similarity]
src/conf/ucm/codecs/nau8824/HeadPhones.conf [moved from src/conf/ucm/nau8824/HeadPhones.conf with 100% similarity]
src/conf/ucm/codecs/nau8824/HeadsetMic.conf [moved from src/conf/ucm/nau8824/HeadsetMic.conf with 100% similarity]
src/conf/ucm/codecs/nau8824/InternalMic.conf [moved from src/conf/ucm/nau8824/InternalMic.conf with 100% similarity]
src/conf/ucm/codecs/nau8824/Makefile.am [moved from src/conf/ucm/nau8824/Makefile.am with 79% similarity]
src/conf/ucm/codecs/nau8824/MonoSpeaker.conf [moved from src/conf/ucm/nau8824/MonoSpeaker.conf with 100% similarity]
src/conf/ucm/codecs/nau8824/Speaker.conf [moved from src/conf/ucm/nau8824/Speaker.conf with 100% similarity]
src/conf/ucm/codecs/rt5640/DigitalMics.conf [moved from src/conf/ucm/rt5640/DigitalMics.conf with 100% similarity]
src/conf/ucm/codecs/rt5640/EnableSeq.conf [moved from src/conf/ucm/rt5640/EnableSeq.conf with 100% similarity]
src/conf/ucm/codecs/rt5640/HeadPhones.conf [moved from src/conf/ucm/rt5640/HeadPhones.conf with 100% similarity]
src/conf/ucm/codecs/rt5640/HeadsetMic.conf [moved from src/conf/ucm/rt5640/HeadsetMic.conf with 100% similarity]
src/conf/ucm/codecs/rt5640/IN1-InternalMic.conf [moved from src/conf/ucm/rt5640/IN1-InternalMic.conf with 100% similarity]
src/conf/ucm/codecs/rt5640/IN3-InternalMic.conf [moved from src/conf/ucm/rt5640/IN3-InternalMic.conf with 100% similarity]
src/conf/ucm/codecs/rt5640/Makefile.am [moved from src/conf/ucm/rt5640/Makefile.am with 82% similarity]
src/conf/ucm/codecs/rt5640/MonoSpeaker.conf [moved from src/conf/ucm/rt5640/MonoSpeaker.conf with 100% similarity]
src/conf/ucm/codecs/rt5640/Speaker.conf [moved from src/conf/ucm/rt5640/Speaker.conf with 100% similarity]
src/conf/ucm/codecs/rt5651/EnableSeq.conf [moved from src/conf/ucm/rt5651/EnableSeq.conf with 100% similarity]
src/conf/ucm/codecs/rt5651/HeadPhones-swapped.conf [moved from src/conf/ucm/rt5651/HeadPhones-swapped.conf with 100% similarity]
src/conf/ucm/codecs/rt5651/HeadPhones.conf [moved from src/conf/ucm/rt5651/HeadPhones.conf with 100% similarity]
src/conf/ucm/codecs/rt5651/IN1-InternalMic.conf [moved from src/conf/ucm/rt5651/IN1-InternalMic.conf with 100% similarity]
src/conf/ucm/codecs/rt5651/IN12-InternalMic.conf [moved from src/conf/ucm/rt5651/IN12-InternalMic.conf with 100% similarity]
src/conf/ucm/codecs/rt5651/IN2-InternalMic.conf [moved from src/conf/ucm/rt5651/IN2-InternalMic.conf with 100% similarity]
src/conf/ucm/codecs/rt5651/IN3-HeadsetMic.conf [moved from src/conf/ucm/rt5651/IN3-HeadsetMic.conf with 100% similarity]
src/conf/ucm/codecs/rt5651/Makefile.am [moved from src/conf/ucm/rt5651/Makefile.am with 85% similarity]
src/conf/ucm/codecs/rt5651/MonoSpeaker.conf [moved from src/conf/ucm/rt5651/MonoSpeaker.conf with 100% similarity]
src/conf/ucm/codecs/rt5651/Speaker.conf [moved from src/conf/ucm/rt5651/Speaker.conf with 100% similarity]
src/conf/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf
src/conf/ucm/platforms/Makefile.am [new file with mode: 0644]
src/conf/ucm/platforms/bytcr/Makefile.am [moved from src/conf/ucm/bytcr/Makefile.am with 71% similarity]
src/conf/ucm/platforms/bytcr/PlatformDisableSeq.conf [moved from src/conf/ucm/bytcr/PlatformDisableSeq.conf with 100% similarity]
src/conf/ucm/platforms/bytcr/PlatformEnableSeq.conf [moved from src/conf/ucm/bytcr/PlatformEnableSeq.conf with 100% similarity]
src/ucm/parser.c

index 4c9d860..d0cab2d 100644 (file)
@@ -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 \
index 7cdc617..85c1509 100644 (file)
@@ -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 \
index 799163d..facc73a 100644 (file)
@@ -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>
index 938b359..c78cdfb 100644 (file)
@@ -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>
index f36b245..34a5d53 100644 (file)
@@ -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>
index 1a08ede..0aa0c02 100644 (file)
@@ -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>
index 4587b2e..e358d4f 100644 (file)
@@ -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>
index decd396..097560d 100644 (file)
@@ -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>
index d243bf8..8a018f6 100644 (file)
@@ -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>
index c833fe7..20ebe2d 100644 (file)
@@ -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>
index dd5b35f..ca8a7d9 100644 (file)
@@ -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>
index 777ed78..60ef6b3 100644 (file)
@@ -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>
index 9f56c07..e75210d 100644 (file)
@@ -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>
index e2a579a..2b7675b 100644 (file)
@@ -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>
index ae52e71..7a8c94b 100644 (file)
@@ -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>
index a73ff5f..45c7837 100644 (file)
@@ -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>
index 8733403..d3928e9 100644 (file)
@@ -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>
index dc52800..97a7ac7 100644 (file)
@@ -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>
index d993f6a..6a3c687 100644 (file)
@@ -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
@@ -0,0 +1,4 @@
+SUBDIRS=\
+rt5640 \
+rt5651 \
+nau8824
similarity index 79%
rename from src/conf/ucm/nau8824/Makefile.am
rename to src/conf/ucm/codecs/nau8824/Makefile.am
index b39b8bb..fd3bafe 100644 (file)
@@ -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)
similarity index 82%
rename from src/conf/ucm/rt5640/Makefile.am
rename to src/conf/ucm/codecs/rt5640/Makefile.am
index a6fbdc5..80fa8cf 100644 (file)
@@ -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)
similarity index 85%
rename from src/conf/ucm/rt5651/Makefile.am
rename to src/conf/ucm/codecs/rt5651/Makefile.am
index acc8ea4..a68bd7b 100644 (file)
@@ -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
index 799163d..facc73a 100644 (file)
@@ -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
@@ -0,0 +1,2 @@
+SUBDIRS=\
+bytcr
similarity index 71%
rename from src/conf/ucm/bytcr/Makefile.am
rename to src/conf/ucm/platforms/bytcr/Makefile.am
index f7a54cb..c53b214 100644 (file)
@@ -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)
index 219edb9..2b6f115 100644 (file)
@@ -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 */
 };