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)
commitd48adc2a206d044678be09953d57971c0e1907c7
tree4e41c9f7d2a2e56dc1bcee059a910b7f37dbb1c3
parent7ca1f6e78c15846951e5d970a864382180be7213
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:
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