OSDN Git Service

conf: Move UCM profile snippets into components subdirectory
authorTakashi Iwai <tiwai@suse.de>
Tue, 27 Nov 2018 12:55:04 +0000 (13:55 +0100)
committerJaroslav Kysela <perex@perex.cz>
Tue, 24 Sep 2019 11:09:05 +0000 (13:09 +0200)
commitae3d8b79afc804fc3c5506f771fd93682d7e45df
tree23752ccf99eed266fcd09a563f7d2c001f80b9cb
parenta0cc5f6e7916b9ba198a468f15d464266feaa6da
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>
43 files changed:
ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf
ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf
ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf
ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf
ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf
ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf
ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf
ucm/bytcr-rt5640/HiFi.conf
ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf
ucm/bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf
ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf
ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf
ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf
ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf
ucm/bytcr-rt5651/HiFi.conf
ucm/chtnau8824/HiFi.conf
ucm/chtrt5645/HiFi.conf
ucm/codecs/nau8824/EnableSeq.conf [moved from ucm/nau8824/EnableSeq.conf with 100% similarity]
ucm/codecs/nau8824/HeadPhones.conf [moved from ucm/nau8824/HeadPhones.conf with 100% similarity]
ucm/codecs/nau8824/HeadsetMic.conf [moved from ucm/nau8824/HeadsetMic.conf with 100% similarity]
ucm/codecs/nau8824/InternalMic.conf [moved from ucm/nau8824/InternalMic.conf with 100% similarity]
ucm/codecs/nau8824/MonoSpeaker.conf [moved from ucm/nau8824/MonoSpeaker.conf with 100% similarity]
ucm/codecs/nau8824/Speaker.conf [moved from ucm/nau8824/Speaker.conf with 100% similarity]
ucm/codecs/rt5640/DigitalMics.conf [moved from ucm/rt5640/DigitalMics.conf with 100% similarity]
ucm/codecs/rt5640/EnableSeq.conf [moved from ucm/rt5640/EnableSeq.conf with 100% similarity]
ucm/codecs/rt5640/HeadPhones.conf [moved from ucm/rt5640/HeadPhones.conf with 100% similarity]
ucm/codecs/rt5640/HeadsetMic.conf [moved from ucm/rt5640/HeadsetMic.conf with 100% similarity]
ucm/codecs/rt5640/IN1-InternalMic.conf [moved from ucm/rt5640/IN1-InternalMic.conf with 100% similarity]
ucm/codecs/rt5640/IN3-InternalMic.conf [moved from ucm/rt5640/IN3-InternalMic.conf with 100% similarity]
ucm/codecs/rt5640/MonoSpeaker.conf [moved from ucm/rt5640/MonoSpeaker.conf with 100% similarity]
ucm/codecs/rt5640/Speaker.conf [moved from ucm/rt5640/Speaker.conf with 100% similarity]
ucm/codecs/rt5651/EnableSeq.conf [moved from ucm/rt5651/EnableSeq.conf with 100% similarity]
ucm/codecs/rt5651/HeadPhones-swapped.conf [moved from ucm/rt5651/HeadPhones-swapped.conf with 100% similarity]
ucm/codecs/rt5651/HeadPhones.conf [moved from ucm/rt5651/HeadPhones.conf with 100% similarity]
ucm/codecs/rt5651/IN1-InternalMic.conf [moved from ucm/rt5651/IN1-InternalMic.conf with 100% similarity]
ucm/codecs/rt5651/IN12-InternalMic.conf [moved from ucm/rt5651/IN12-InternalMic.conf with 100% similarity]
ucm/codecs/rt5651/IN2-InternalMic.conf [moved from ucm/rt5651/IN2-InternalMic.conf with 100% similarity]
ucm/codecs/rt5651/IN3-HeadsetMic.conf [moved from ucm/rt5651/IN3-HeadsetMic.conf with 100% similarity]
ucm/codecs/rt5651/MonoSpeaker.conf [moved from ucm/rt5651/MonoSpeaker.conf with 100% similarity]
ucm/codecs/rt5651/Speaker.conf [moved from ucm/rt5651/Speaker.conf with 100% similarity]
ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf
ucm/platforms/bytcr/PlatformDisableSeq.conf [moved from ucm/bytcr/PlatformDisableSeq.conf with 100% similarity]
ucm/platforms/bytcr/PlatformEnableSeq.conf [moved from ucm/bytcr/PlatformEnableSeq.conf with 100% similarity]