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>

52 files changed, 147 insertions, 138 deletions

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"
-		<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 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"
 
-		<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 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"
 
-		<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 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"
 
-		<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 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"
 
-		<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 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"
 
-		<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 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"
 
-		<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 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"
 
-		<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 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"
-		<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 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"
-		<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 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"
-		<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 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"
-		<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 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"
-		<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 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"
-		<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 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"
-		<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 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"
-		<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 d993f6ae..6a3c6875 100644
--- 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
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
index 05f5f0b4..05f5f0b4 100644
--- a/src/conf/ucm/nau8824/EnableSeq.conf
+++ b/src/conf/ucm/codecs/nau8824/EnableSeq.conf
diff --git a/src/conf/ucm/nau8824/HeadPhones.conf b/src/conf/ucm/codecs/nau8824/HeadPhones.conf
index 8ed6f194..8ed6f194 100644
--- a/src/conf/ucm/nau8824/HeadPhones.conf
+++ b/src/conf/ucm/codecs/nau8824/HeadPhones.conf
diff --git a/src/conf/ucm/nau8824/HeadsetMic.conf b/src/conf/ucm/codecs/nau8824/HeadsetMic.conf
index 11b0b52a..11b0b52a 100644
--- a/src/conf/ucm/nau8824/HeadsetMic.conf
+++ b/src/conf/ucm/codecs/nau8824/HeadsetMic.conf
diff --git a/src/conf/ucm/nau8824/InternalMic.conf b/src/conf/ucm/codecs/nau8824/InternalMic.conf
index c6a741cc..c6a741cc 100644
--- a/src/conf/ucm/nau8824/InternalMic.conf
+++ b/src/conf/ucm/codecs/nau8824/InternalMic.conf
diff --git a/src/conf/ucm/nau8824/Makefile.am b/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
index 86735181..86735181 100644
--- a/src/conf/ucm/nau8824/MonoSpeaker.conf
+++ b/src/conf/ucm/codecs/nau8824/MonoSpeaker.conf
diff --git a/src/conf/ucm/nau8824/Speaker.conf b/src/conf/ucm/codecs/nau8824/Speaker.conf
index e4d25b08..e4d25b08 100644
--- a/src/conf/ucm/nau8824/Speaker.conf
+++ b/src/conf/ucm/codecs/nau8824/Speaker.conf
diff --git a/src/conf/ucm/rt5640/DigitalMics.conf b/src/conf/ucm/codecs/rt5640/DigitalMics.conf
index 06b42f16..06b42f16 100644
--- a/src/conf/ucm/rt5640/DigitalMics.conf
+++ b/src/conf/ucm/codecs/rt5640/DigitalMics.conf
diff --git a/src/conf/ucm/rt5640/EnableSeq.conf b/src/conf/ucm/codecs/rt5640/EnableSeq.conf
index 62795fa6..62795fa6 100644
--- a/src/conf/ucm/rt5640/EnableSeq.conf
+++ b/src/conf/ucm/codecs/rt5640/EnableSeq.conf
diff --git a/src/conf/ucm/rt5640/HeadPhones.conf b/src/conf/ucm/codecs/rt5640/HeadPhones.conf
index 38f37a6f..38f37a6f 100644
--- a/src/conf/ucm/rt5640/HeadPhones.conf
+++ b/src/conf/ucm/codecs/rt5640/HeadPhones.conf
diff --git a/src/conf/ucm/rt5640/HeadsetMic.conf b/src/conf/ucm/codecs/rt5640/HeadsetMic.conf
index 567d4122..567d4122 100644
--- a/src/conf/ucm/rt5640/HeadsetMic.conf
+++ b/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
index 3bf31e64..3bf31e64 100644
--- a/src/conf/ucm/rt5640/IN1-InternalMic.conf
+++ b/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
index e1a6c49b..e1a6c49b 100644
--- a/src/conf/ucm/rt5640/IN3-InternalMic.conf
+++ b/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
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
index 58ab7807..58ab7807 100644
--- a/src/conf/ucm/rt5640/MonoSpeaker.conf
+++ b/src/conf/ucm/codecs/rt5640/MonoSpeaker.conf
diff --git a/src/conf/ucm/rt5640/Speaker.conf b/src/conf/ucm/codecs/rt5640/Speaker.conf
index a7df9fbf..a7df9fbf 100644
--- a/src/conf/ucm/rt5640/Speaker.conf
+++ b/src/conf/ucm/codecs/rt5640/Speaker.conf
diff --git a/src/conf/ucm/rt5651/EnableSeq.conf b/src/conf/ucm/codecs/rt5651/EnableSeq.conf
index 6fb3c1f2..6fb3c1f2 100644
--- a/src/conf/ucm/rt5651/EnableSeq.conf
+++ b/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
index e79b40a7..e79b40a7 100644
--- a/src/conf/ucm/rt5651/HeadPhones-swapped.conf
+++ b/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
index eaf5fdfc..eaf5fdfc 100644
--- a/src/conf/ucm/rt5651/HeadPhones.conf
+++ b/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
index 85e25a5c..85e25a5c 100644
--- a/src/conf/ucm/rt5651/IN1-InternalMic.conf
+++ b/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
index f1cc17fe..f1cc17fe 100644
--- a/src/conf/ucm/rt5651/IN12-InternalMic.conf
+++ b/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
index 18f74e1a..18f74e1a 100644
--- a/src/conf/ucm/rt5651/IN2-InternalMic.conf
+++ b/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
index bfd0b009..bfd0b009 100644
--- a/src/conf/ucm/rt5651/IN3-HeadsetMic.conf
+++ b/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
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
index 0c3492fb..0c3492fb 100644
--- a/src/conf/ucm/rt5651/MonoSpeaker.conf
+++ b/src/conf/ucm/codecs/rt5651/MonoSpeaker.conf
diff --git a/src/conf/ucm/rt5651/Speaker.conf b/src/conf/ucm/codecs/rt5651/Speaker.conf
index c1091523..c1091523 100644
--- a/src/conf/ucm/rt5651/Speaker.conf
+++ b/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"
-		<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
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
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
index 9bb018bc..9bb018bc 100644
--- a/src/conf/ucm/bytcr/PlatformDisableSeq.conf
+++ b/src/conf/ucm/platforms/bytcr/PlatformDisableSeq.conf
diff --git a/src/conf/ucm/bytcr/PlatformEnableSeq.conf b/src/conf/ucm/platforms/bytcr/PlatformEnableSeq.conf
index b5ee2b41..b5ee2b41 100644
--- a/src/conf/ucm/bytcr/PlatformEnableSeq.conf
+++ b/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 */
 };