November 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] Applied "ASoC: Intel: Skylake: Make DSP replies more human readable" to the asoc tree
by Mark Brown 28 Nov '18

28 Nov '18

The patch ASoC: Intel: Skylake: Make DSP replies more human readable has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From aa15679b2dc898049e9117fbe3ddda0b50fa52d2 Mon Sep 17 00:00:00 2001 From: "Subhransu S. Prusty" <subhransu.s.prusty(a)intel.com> Date: Mon, 29 Jan 2018 21:45:59 +0530 Subject: [PATCH] ASoC: Intel: Skylake: Make DSP replies more human readable Add more meaning to the IPC replies for easy debugging. Replace the switch case with a lookup table to lookup for the IPC replies and print in human readable form. Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Signed-off-by: Sriram Periyasamy <sriramx.periyasamy(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/intel/skylake/skl-sst-ipc.c | 44 ++++++++++++++++++++------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/sound/soc/intel/skylake/skl-sst-ipc.c b/sound/soc/intel/skylake/skl-sst-ipc.c index 5234fafb758a..8708755a8f9a 100644 --- a/sound/soc/intel/skylake/skl-sst-ipc.c +++ b/sound/soc/intel/skylake/skl-sst-ipc.c @@ -392,18 +392,43 @@ int skl_ipc_process_notification(struct sst_generic_ipc *ipc, return 0; } -static int skl_ipc_set_reply_error_code(u32 reply) +struct skl_ipc_err_map { + const char *msg; + enum skl_ipc_glb_reply reply; + int err; +}; + +static struct skl_ipc_err_map skl_err_map[] = { + {"DSP out of memory", IPC_GLB_REPLY_OUT_OF_MEMORY, -ENOMEM}, + {"DSP busy", IPC_GLB_REPLY_BUSY, -EBUSY}, +}; + +static int skl_ipc_set_reply_error_code(struct sst_generic_ipc *ipc, u32 reply) { - switch (reply) { - case IPC_GLB_REPLY_OUT_OF_MEMORY: - return -ENOMEM; + int i; - case IPC_GLB_REPLY_BUSY: - return -EBUSY; + for (i = 0; i < ARRAY_SIZE(skl_err_map); i++) { + if (skl_err_map[i].reply == reply) + break; + } - default: + if (i == ARRAY_SIZE(skl_err_map)) { + dev_err(ipc->dev, "ipc FW reply: %d FW Error Code: %u\n", + reply, + ipc->dsp->fw_ops.get_fw_errcode(ipc->dsp)); return -EINVAL; } + + if (skl_err_map[i].err < 0) + dev_err(ipc->dev, "ipc FW reply: %s FW Error Code: %u\n", + skl_err_map[i].msg, + ipc->dsp->fw_ops.get_fw_errcode(ipc->dsp)); + else + dev_info(ipc->dev, "ipc FW reply: %s FW Error Code: %u\n", + skl_err_map[i].msg, + ipc->dsp->fw_ops.get_fw_errcode(ipc->dsp)); + + return skl_err_map[i].err; } void skl_ipc_process_reply(struct sst_generic_ipc *ipc, @@ -441,10 +466,7 @@ void skl_ipc_process_reply(struct sst_generic_ipc *ipc, } } else { - msg->errno = skl_ipc_set_reply_error_code(reply); - dev_err(ipc->dev, "ipc FW reply: reply=%d\n", reply); - dev_err(ipc->dev, "FW Error Code: %u\n", - ipc->dsp->fw_ops.get_fw_errcode(ipc->dsp)); + msg->errno = skl_ipc_set_reply_error_code(ipc, reply); switch (IPC_GLB_NOTIFY_MSG_TYPE(header.primary)) { case IPC_GLB_LOAD_MULTIPLE_MODS: case IPC_GLB_LOAD_LIBRARY: -- 2.19.1

1 0

[alsa-devel] Applied "ASoC: Intel: Skylake: Add FW reply for MCLK/SCLK IPC" to the asoc tree
by Mark Brown 28 Nov '18

28 Nov '18

The patch ASoC: Intel: Skylake: Add FW reply for MCLK/SCLK IPC has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 61f94ee4a7435c35d78b22e4ae6e0551908000ae Mon Sep 17 00:00:00 2001 From: "Subhransu S. Prusty" <subhransu.s.prusty(a)intel.com> Date: Mon, 29 Jan 2018 21:46:00 +0530 Subject: [PATCH] ASoC: Intel: Skylake: Add FW reply for MCLK/SCLK IPC If mclk/sclk is already running, FW responds with IPC reply MCLK/SCLK already running. Add these to the IPC reply lookup table. Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Signed-off-by: Sriram Periyasamy <sriramx.periyasamy(a)intel.com> Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/intel/skylake/skl-sst-ipc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/intel/skylake/skl-sst-ipc.c b/sound/soc/intel/skylake/skl-sst-ipc.c index 8708755a8f9a..9f3ce73593ae 100644 --- a/sound/soc/intel/skylake/skl-sst-ipc.c +++ b/sound/soc/intel/skylake/skl-sst-ipc.c @@ -249,6 +249,8 @@ enum skl_ipc_glb_reply { IPC_GLB_REPLY_INVALID_CONFIG_DATA_LEN = 121, IPC_GLB_REPLY_GATEWAY_NOT_INITIALIZED = 140, IPC_GLB_REPLY_GATEWAY_NOT_EXIST = 141, + IPC_GLB_REPLY_SCLK_ALREADY_RUNNING = 150, + IPC_GLB_REPLY_MCLK_ALREADY_RUNNING = 151, IPC_GLB_REPLY_PPL_NOT_INITIALIZED = 160, IPC_GLB_REPLY_PPL_NOT_EXIST = 161, @@ -401,6 +403,10 @@ struct skl_ipc_err_map { static struct skl_ipc_err_map skl_err_map[] = { {"DSP out of memory", IPC_GLB_REPLY_OUT_OF_MEMORY, -ENOMEM}, {"DSP busy", IPC_GLB_REPLY_BUSY, -EBUSY}, + {"SCLK already running", IPC_GLB_REPLY_SCLK_ALREADY_RUNNING, + IPC_GLB_REPLY_SCLK_ALREADY_RUNNING}, + {"MCLK already running", IPC_GLB_REPLY_MCLK_ALREADY_RUNNING, + IPC_GLB_REPLY_MCLK_ALREADY_RUNNING}, }; static int skl_ipc_set_reply_error_code(struct sst_generic_ipc *ipc, u32 reply) -- 2.19.1

1 0

[alsa-devel] [PATCH 0/4] ASoC; davinci-mcasp: Pin handling updates
by Peter Ujfalusi 28 Nov '18

28 Nov '18

Hi, The series will improve the McASP pin handling: - To avoid non configured clocks leaking out from McASP - make sure that the AXR pin (TX) state is correct in all scenarios - Allow user configurable DISMOD for the tx pin instead of hardwiring it in the code to low The DISMOD configuration is needed when the codec requires the TX line to be high during inactive slots (mu-law codecs for example). Regards, Peter --- Peter Ujfalusi (4): ASoC: davinci-mcasp: Clear TXSTAT register before activating serializers ASoC: davinci-mcasp: Update PDIR (pin direction) register handling bindings: sound: davinci-mcasp: Document dismod optional property ASoC: davinci-mcasp: Implement configurable dismod handling .../bindings/sound/davinci-mcasp-audio.txt | 5 + include/linux/platform_data/davinci_asp.h | 1 + sound/soc/davinci/davinci-mcasp.c | 109 +++++++++++++++--- sound/soc/davinci/davinci-mcasp.h | 30 ++--- 4 files changed, 112 insertions(+), 33 deletions(-) -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2 8

[alsa-devel] Pioneer Interface 2 support?
by Daniel James 28 Nov '18

28 Nov '18

Hi folks, A user of the PiDeck project is interested in helping to add ALSA support for this USB audio interface: https://www.pioneerdj.com/en-gb/product/software/interface-2/audio-interfac… Some initial information is here: https://github.com/pideck/pideck/issues/85 Is there anyone willing to hack on this please? Does the info script available at http://www.alsa-project.org/main/index.php/Help_To_Debug provide additional details that would be useful to have? Thanks! Daniel

2 2

[alsa-devel] [PATCH 1/4] ASoC: qcom: sdm845: Add board specific dapm widgets
by Cheng-Yi Chiang 28 Nov '18

28 Nov '18

Add board specific dapm widgets so these widgets can be used in the route. Signed-off-by: Rohit kumar <rohitkr(a)codeaurora.org> Signed-off-by: Cheng-Yi Chiang <cychiang(a)chromium.org> --- sound/soc/qcom/sdm845.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/soc/qcom/sdm845.c b/sound/soc/qcom/sdm845.c index 58593db2ab151..95d8d4422dae0 100644 --- a/sound/soc/qcom/sdm845.c +++ b/sound/soc/qcom/sdm845.c @@ -212,6 +212,14 @@ static int sdm845_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, return 0; } +static const struct snd_soc_dapm_widget sdm845_snd_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_SPK("Left Spk", NULL), + SND_SOC_DAPM_SPK("Right Spk", NULL), + SND_SOC_DAPM_MIC("Int Mic", NULL), +}; + static void sdm845_add_be_ops(struct snd_soc_card *card) { struct snd_soc_dai_link *link; @@ -243,6 +251,8 @@ static int sdm845_snd_platform_probe(struct platform_device *pdev) goto data_alloc_fail; } + card->dapm_widgets = sdm845_snd_widgets; + card->num_dapm_widgets = ARRAY_SIZE(sdm845_snd_widgets); card->dev = dev; dev_set_drvdata(dev, card); ret = qcom_snd_parse_of(card); -- 2.20.0.rc0.387.gc7a69e6b6c-goog

2 8

[alsa-devel] HDA headset button support
by Kailang 28 Nov '18

28 Nov '18

Hi Takashi, New Chrome platform need to support HS button function. I sent it to Intel chrome team already. Could you take a look for attach patch? I think it maybe could upstream. It just waiting for test by Intel Chrome team. Thanks. BR, Kailang

2 1

[alsa-devel] [alsa-lib][PATCH v2] conf: USB-Audio: Add Dell WD19 Dock in the IEC958 blacklist
by Hui Wang 28 Nov '18

28 Nov '18

This Dock doesn't have IEC958 physical output, so add it to the blacklist to prevent it being opened. Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- In the v2, the 2nd patch of adding wd19 ucm is dropped. here only adding wd19 into the blacklist, I don't know if wd15 has this issue or not, if it has, will adding wd15 to the blacklist too. src/conf/cards/USB-Audio.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf index 05779c47..3a12a729 100644 --- a/src/conf/cards/USB-Audio.conf +++ b/src/conf/cards/USB-Audio.conf @@ -60,6 +60,7 @@ USB-Audio.pcm.iec958_device { "SWTOR Gaming Headset by Razer" 999 "USB Device 0x46d_0x821" 999 "USB Device 0x46d_0x992" 999 + "WD19 Dock" 999 } # Second iec958 device number, if any. -- 2.17.1

2 1

[alsa-devel] [PATCH v2] ALSA: usb-audio: Add vendor and product name for Dell WD19 Dock
by Hui Wang 28 Nov '18

28 Nov '18

Like the Dell WD15 Dock, the WD19 Dock (0bda:402e) doens't provide useful string for the vendor and product names too. In order to share the UCM with WD15, here we keep the profile_name same as the WD15. Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/usb/quirks-table.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 849953e5775c..37fc0447c071 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3382,5 +3382,15 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), .ifnum = QUIRK_NO_INTERFACE } }, +/* Dell WD19 Dock */ +{ + USB_DEVICE(0x0bda, 0x402e), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + .vendor_name = "Dell", + .product_name = "WD19 Dock", + .profile_name = "Dell-WD15-Dock", + .ifnum = QUIRK_NO_INTERFACE + } +}, #undef USB_DEVICE_VENDOR_SPEC -- 2.17.1

2 1

[alsa-devel] [PATCH] conf: Move UCM profile snippets into ucm-includes subdirectory
by Takashi Iwai 28 Nov '18

28 Nov '18

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 For avoiding this, move UCM profile snippets into the own root directory, src/conf/ucm-includes, and include them by changing the include with "<searchdir:ucm-includes>". Suggested-by: Hans de Goede <hdegoede(a)redhat.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- configure.ac | 9 +++++---- src/conf/Makefile.am | 2 +- src/conf/ucm-includes/Makefile.am | 5 +++++ src/conf/{ucm => ucm-includes}/bytcr/Makefile.am | 2 +- .../{ucm => ucm-includes}/bytcr/PlatformDisableSeq.conf | 0 .../{ucm => ucm-includes}/bytcr/PlatformEnableSeq.conf | 0 src/conf/{ucm => ucm-includes}/nau8824/EnableSeq.conf | 0 src/conf/{ucm => ucm-includes}/nau8824/HeadPhones.conf | 0 src/conf/{ucm => ucm-includes}/nau8824/HeadsetMic.conf | 0 src/conf/{ucm => ucm-includes}/nau8824/InternalMic.conf | 0 src/conf/{ucm => ucm-includes}/nau8824/Makefile.am | 2 +- src/conf/{ucm => ucm-includes}/nau8824/MonoSpeaker.conf | 0 src/conf/{ucm => ucm-includes}/nau8824/Speaker.conf | 0 src/conf/{ucm => ucm-includes}/rt5640/DigitalMics.conf | 0 src/conf/{ucm => ucm-includes}/rt5640/EnableSeq.conf | 0 src/conf/{ucm => ucm-includes}/rt5640/HeadPhones.conf | 0 src/conf/{ucm => ucm-includes}/rt5640/HeadsetMic.conf | 0 .../{ucm => ucm-includes}/rt5640/IN1-InternalMic.conf | 0 .../{ucm => ucm-includes}/rt5640/IN3-InternalMic.conf | 0 src/conf/{ucm => ucm-includes}/rt5640/Makefile.am | 2 +- src/conf/{ucm => ucm-includes}/rt5640/MonoSpeaker.conf | 0 src/conf/{ucm => ucm-includes}/rt5640/Speaker.conf | 0 src/conf/{ucm => ucm-includes}/rt5651/EnableSeq.conf | 0 .../{ucm => ucm-includes}/rt5651/HeadPhones-swapped.conf | 0 src/conf/{ucm => ucm-includes}/rt5651/HeadPhones.conf | 0 .../{ucm => ucm-includes}/rt5651/IN1-InternalMic.conf | 0 .../{ucm => ucm-includes}/rt5651/IN12-InternalMic.conf | 0 .../{ucm => ucm-includes}/rt5651/IN2-InternalMic.conf | 0 .../{ucm => ucm-includes}/rt5651/IN3-HeadsetMic.conf | 0 src/conf/{ucm => ucm-includes}/rt5651/Makefile.am | 2 +- src/conf/{ucm => ucm-includes}/rt5651/MonoSpeaker.conf | 0 src/conf/{ucm => ucm-includes}/rt5651/Speaker.conf | 0 src/conf/ucm/Makefile.am | 4 ---- .../ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf | 2 +- src/conf/ucm/bytcr-rt5640-mono-spk-dmic1-mic/HiFi.conf | 2 +- src/conf/ucm/bytcr-rt5640-mono-spk-in1-mic/HiFi.conf | 2 +- src/conf/ucm/bytcr-rt5640-mono-spk-in3-mic/HiFi.conf | 2 +- src/conf/ucm/bytcr-rt5640-stereo-spk-dmic1-mic/HiFi.conf | 2 +- src/conf/ucm/bytcr-rt5640-stereo-spk-in1-mic/HiFi.conf | 2 +- src/conf/ucm/bytcr-rt5640-stereo-spk-in3-mic/HiFi.conf | 2 +- src/conf/ucm/bytcr-rt5640/HiFi.conf | 2 +- src/conf/ucm/bytcr-rt5651-mono-spk-in1-mic/HiFi.conf | 2 +- .../bytcr-rt5651-mono-spk-in2-mic-hp-swapped/HiFi.conf | 2 +- src/conf/ucm/bytcr-rt5651-mono-spk-in2-mic/HiFi.conf | 2 +- src/conf/ucm/bytcr-rt5651-stereo-spk-in1-mic/HiFi.conf | 2 +- src/conf/ucm/bytcr-rt5651-stereo-spk-in12-mic/HiFi.conf | 2 +- src/conf/ucm/bytcr-rt5651-stereo-spk-in2-mic/HiFi.conf | 2 +- src/conf/ucm/bytcr-rt5651/HiFi.conf | 2 +- src/conf/ucm/chtnau8824/HiFi.conf | 2 +- .../ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf | 2 +- 50 files changed, 32 insertions(+), 30 deletions(-) create mode 100644 src/conf/ucm-includes/Makefile.am rename src/conf/{ucm => ucm-includes}/bytcr/Makefile.am (72%) rename src/conf/{ucm => ucm-includes}/bytcr/PlatformDisableSeq.conf (100%) rename src/conf/{ucm => ucm-includes}/bytcr/PlatformEnableSeq.conf (100%) rename src/conf/{ucm => ucm-includes}/nau8824/EnableSeq.conf (100%) rename src/conf/{ucm => ucm-includes}/nau8824/HeadPhones.conf (100%) rename src/conf/{ucm => ucm-includes}/nau8824/HeadsetMic.conf (100%) rename src/conf/{ucm => ucm-includes}/nau8824/InternalMic.conf (100%) rename src/conf/{ucm => ucm-includes}/nau8824/Makefile.am (78%) rename src/conf/{ucm => ucm-includes}/nau8824/MonoSpeaker.conf (100%) rename src/conf/{ucm => ucm-includes}/nau8824/Speaker.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5640/DigitalMics.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5640/EnableSeq.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5640/HeadPhones.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5640/HeadsetMic.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5640/IN1-InternalMic.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5640/IN3-InternalMic.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5640/Makefile.am (81%) rename src/conf/{ucm => ucm-includes}/rt5640/MonoSpeaker.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5640/Speaker.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5651/EnableSeq.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5651/HeadPhones-swapped.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5651/HeadPhones.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5651/IN1-InternalMic.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5651/IN12-InternalMic.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5651/IN2-InternalMic.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5651/IN3-HeadsetMic.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5651/Makefile.am (84%) rename src/conf/{ucm => ucm-includes}/rt5651/MonoSpeaker.conf (100%) rename src/conf/{ucm => ucm-includes}/rt5651/Speaker.conf (100%) diff --git a/configure.ac b/configure.ac index 4c9d860fd0e5..0b7a1bdc42fa 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,20 @@ 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-includes/Makefile \ + src/conf/ucm-includes/bytcr/Makefile \ + src/conf/ucm-includes/nau8824/Makefile \ + src/conf/ucm-includes/rt5640/Makefile \ + src/conf/ucm-includes/rt5651/Makefile \ src/conf/topology/Makefile \ src/conf/topology/broadwell/Makefile \ modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \ diff --git a/src/conf/Makefile.am b/src/conf/Makefile.am index 2b46f95c2cb7..4a4022e9bc1b 100644 --- a/src/conf/Makefile.am +++ b/src/conf/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS=cards pcm if BUILD_UCM -SUBDIRS += ucm +SUBDIRS += ucm ucm-includes endif if BUILD_TOPOLOGY SUBDIRS += topology diff --git a/src/conf/ucm-includes/Makefile.am b/src/conf/ucm-includes/Makefile.am new file mode 100644 index 000000000000..f94bba7b837f --- /dev/null +++ b/src/conf/ucm-includes/Makefile.am @@ -0,0 +1,5 @@ +SUBDIRS=\ +bytcr \ +rt5640 \ +rt5651 \ +nau8824 diff --git a/src/conf/ucm/bytcr/Makefile.am b/src/conf/ucm-includes/bytcr/Makefile.am similarity index 72% rename from src/conf/ucm/bytcr/Makefile.am rename to src/conf/ucm-includes/bytcr/Makefile.am index f7a54cbdedcd..f9565a53eaf2 100644 --- a/src/conf/ucm/bytcr/Makefile.am +++ b/src/conf/ucm-includes/bytcr/Makefile.am @@ -1,4 +1,4 @@ alsaconfigdir = @ALSA_CONFIG_DIR@ -ucmdir = $(alsaconfigdir)/ucm/bytcr +ucmdir = $(alsaconfigdir)/ucm-includes/bytcr ucm_DATA = PlatformEnableSeq.conf PlatformDisableSeq.conf EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/bytcr/PlatformDisableSeq.conf b/src/conf/ucm-includes/bytcr/PlatformDisableSeq.conf similarity index 100% rename from src/conf/ucm/bytcr/PlatformDisableSeq.conf rename to src/conf/ucm-includes/bytcr/PlatformDisableSeq.conf diff --git a/src/conf/ucm/bytcr/PlatformEnableSeq.conf b/src/conf/ucm-includes/bytcr/PlatformEnableSeq.conf similarity index 100% rename from src/conf/ucm/bytcr/PlatformEnableSeq.conf rename to src/conf/ucm-includes/bytcr/PlatformEnableSeq.conf diff --git a/src/conf/ucm/nau8824/EnableSeq.conf b/src/conf/ucm-includes/nau8824/EnableSeq.conf similarity index 100% rename from src/conf/ucm/nau8824/EnableSeq.conf rename to src/conf/ucm-includes/nau8824/EnableSeq.conf diff --git a/src/conf/ucm/nau8824/HeadPhones.conf b/src/conf/ucm-includes/nau8824/HeadPhones.conf similarity index 100% rename from src/conf/ucm/nau8824/HeadPhones.conf rename to src/conf/ucm-includes/nau8824/HeadPhones.conf diff --git a/src/conf/ucm/nau8824/HeadsetMic.conf b/src/conf/ucm-includes/nau8824/HeadsetMic.conf similarity index 100% rename from src/conf/ucm/nau8824/HeadsetMic.conf rename to src/conf/ucm-includes/nau8824/HeadsetMic.conf diff --git a/src/conf/ucm/nau8824/InternalMic.conf b/src/conf/ucm-includes/nau8824/InternalMic.conf similarity index 100% rename from src/conf/ucm/nau8824/InternalMic.conf rename to src/conf/ucm-includes/nau8824/InternalMic.conf diff --git a/src/conf/ucm/nau8824/Makefile.am b/src/conf/ucm-includes/nau8824/Makefile.am similarity index 78% rename from src/conf/ucm/nau8824/Makefile.am rename to src/conf/ucm-includes/nau8824/Makefile.am index b39b8bb4c934..aa65f4bd9b53 100644 --- a/src/conf/ucm/nau8824/Makefile.am +++ b/src/conf/ucm-includes/nau8824/Makefile.am @@ -1,5 +1,5 @@ alsaconfigdir = @ALSA_CONFIG_DIR@ -ucmdir = $(alsaconfigdir)/ucm/nau8824 +ucmdir = $(alsaconfigdir)/ucm-includes/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-includes/nau8824/MonoSpeaker.conf similarity index 100% rename from src/conf/ucm/nau8824/MonoSpeaker.conf rename to src/conf/ucm-includes/nau8824/MonoSpeaker.conf diff --git a/src/conf/ucm/nau8824/Speaker.conf b/src/conf/ucm-includes/nau8824/Speaker.conf similarity index 100% rename from src/conf/ucm/nau8824/Speaker.conf rename to src/conf/ucm-includes/nau8824/Speaker.conf diff --git a/src/conf/ucm/rt5640/DigitalMics.conf b/src/conf/ucm-includes/rt5640/DigitalMics.conf similarity index 100% rename from src/conf/ucm/rt5640/DigitalMics.conf rename to src/conf/ucm-includes/rt5640/DigitalMics.conf diff --git a/src/conf/ucm/rt5640/EnableSeq.conf b/src/conf/ucm-includes/rt5640/EnableSeq.conf similarity index 100% rename from src/conf/ucm/rt5640/EnableSeq.conf rename to src/conf/ucm-includes/rt5640/EnableSeq.conf diff --git a/src/conf/ucm/rt5640/HeadPhones.conf b/src/conf/ucm-includes/rt5640/HeadPhones.conf similarity index 100% rename from src/conf/ucm/rt5640/HeadPhones.conf rename to src/conf/ucm-includes/rt5640/HeadPhones.conf diff --git a/src/conf/ucm/rt5640/HeadsetMic.conf b/src/conf/ucm-includes/rt5640/HeadsetMic.conf similarity index 100% rename from src/conf/ucm/rt5640/HeadsetMic.conf rename to src/conf/ucm-includes/rt5640/HeadsetMic.conf diff --git a/src/conf/ucm/rt5640/IN1-InternalMic.conf b/src/conf/ucm-includes/rt5640/IN1-InternalMic.conf similarity index 100% rename from src/conf/ucm/rt5640/IN1-InternalMic.conf rename to src/conf/ucm-includes/rt5640/IN1-InternalMic.conf diff --git a/src/conf/ucm/rt5640/IN3-InternalMic.conf b/src/conf/ucm-includes/rt5640/IN3-InternalMic.conf similarity index 100% rename from src/conf/ucm/rt5640/IN3-InternalMic.conf rename to src/conf/ucm-includes/rt5640/IN3-InternalMic.conf diff --git a/src/conf/ucm/rt5640/Makefile.am b/src/conf/ucm-includes/rt5640/Makefile.am similarity index 81% rename from src/conf/ucm/rt5640/Makefile.am rename to src/conf/ucm-includes/rt5640/Makefile.am index a6fbdc572529..2cbea4da4543 100644 --- a/src/conf/ucm/rt5640/Makefile.am +++ b/src/conf/ucm-includes/rt5640/Makefile.am @@ -1,5 +1,5 @@ alsaconfigdir = @ALSA_CONFIG_DIR@ -ucmdir = $(alsaconfigdir)/ucm/rt5640 +ucmdir = $(alsaconfigdir)/ucm-includes/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-includes/rt5640/MonoSpeaker.conf similarity index 100% rename from src/conf/ucm/rt5640/MonoSpeaker.conf rename to src/conf/ucm-includes/rt5640/MonoSpeaker.conf diff --git a/src/conf/ucm/rt5640/Speaker.conf b/src/conf/ucm-includes/rt5640/Speaker.conf similarity index 100% rename from src/conf/ucm/rt5640/Speaker.conf rename to src/conf/ucm-includes/rt5640/Speaker.conf diff --git a/src/conf/ucm/rt5651/EnableSeq.conf b/src/conf/ucm-includes/rt5651/EnableSeq.conf similarity index 100% rename from src/conf/ucm/rt5651/EnableSeq.conf rename to src/conf/ucm-includes/rt5651/EnableSeq.conf diff --git a/src/conf/ucm/rt5651/HeadPhones-swapped.conf b/src/conf/ucm-includes/rt5651/HeadPhones-swapped.conf similarity index 100% rename from src/conf/ucm/rt5651/HeadPhones-swapped.conf rename to src/conf/ucm-includes/rt5651/HeadPhones-swapped.conf diff --git a/src/conf/ucm/rt5651/HeadPhones.conf b/src/conf/ucm-includes/rt5651/HeadPhones.conf similarity index 100% rename from src/conf/ucm/rt5651/HeadPhones.conf rename to src/conf/ucm-includes/rt5651/HeadPhones.conf diff --git a/src/conf/ucm/rt5651/IN1-InternalMic.conf b/src/conf/ucm-includes/rt5651/IN1-InternalMic.conf similarity index 100% rename from src/conf/ucm/rt5651/IN1-InternalMic.conf rename to src/conf/ucm-includes/rt5651/IN1-InternalMic.conf diff --git a/src/conf/ucm/rt5651/IN12-InternalMic.conf b/src/conf/ucm-includes/rt5651/IN12-InternalMic.conf similarity index 100% rename from src/conf/ucm/rt5651/IN12-InternalMic.conf rename to src/conf/ucm-includes/rt5651/IN12-InternalMic.conf diff --git a/src/conf/ucm/rt5651/IN2-InternalMic.conf b/src/conf/ucm-includes/rt5651/IN2-InternalMic.conf similarity index 100% rename from src/conf/ucm/rt5651/IN2-InternalMic.conf rename to src/conf/ucm-includes/rt5651/IN2-InternalMic.conf diff --git a/src/conf/ucm/rt5651/IN3-HeadsetMic.conf b/src/conf/ucm-includes/rt5651/IN3-HeadsetMic.conf similarity index 100% rename from src/conf/ucm/rt5651/IN3-HeadsetMic.conf rename to src/conf/ucm-includes/rt5651/IN3-HeadsetMic.conf diff --git a/src/conf/ucm/rt5651/Makefile.am b/src/conf/ucm-includes/rt5651/Makefile.am similarity index 84% rename from src/conf/ucm/rt5651/Makefile.am rename to src/conf/ucm-includes/rt5651/Makefile.am index acc8ea491043..f513b8c4d6f6 100644 --- a/src/conf/ucm/rt5651/Makefile.am +++ b/src/conf/ucm-includes/rt5651/Makefile.am @@ -1,5 +1,5 @@ alsaconfigdir = @ALSA_CONFIG_DIR@ -ucmdir = $(alsaconfigdir)/ucm/rt5651 +ucmdir = $(alsaconfigdir)/ucm-includes/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-includes/rt5651/MonoSpeaker.conf similarity index 100% rename from src/conf/ucm/rt5651/MonoSpeaker.conf rename to src/conf/ucm-includes/rt5651/MonoSpeaker.conf diff --git a/src/conf/ucm/rt5651/Speaker.conf b/src/conf/ucm-includes/rt5651/Speaker.conf similarity index 100% rename from src/conf/ucm/rt5651/Speaker.conf rename to src/conf/ucm-includes/rt5651/Speaker.conf diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index 7cdc6176584a..2c98eac0b745 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -2,7 +2,6 @@ SUBDIRS=\ 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 +28,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 799163dbe481..f9c64ea16bd5 100644 --- a/src/conf/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf +++ b/src/conf/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/HiFi.conf @@ -1,4 +1,4 @@ -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { 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 938b359290d4..15b521be02e5 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 @@ -1,6 +1,6 @@ # Use case Configuration for bytcr-rt5640 -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { EnableSequence [ 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 f36b245e5092..f9aa2cb2d2b1 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 @@ -1,6 +1,6 @@ # Use case Configuration for bytcr-rt5640 -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { EnableSequence [ 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 1a08ededc40c..0bec7f056de1 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 @@ -1,6 +1,6 @@ # Use case Configuration for bytcr-rt5640 -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { EnableSequence [ 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 4587b2e1294e..7c8388a0e153 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 @@ -1,6 +1,6 @@ # Use case Configuration for bytcr-rt5640 -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { EnableSequence [ 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 decd396047aa..f074576b053b 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 @@ -1,6 +1,6 @@ # Use case Configuration for bytcr-rt5640 -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { EnableSequence [ 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 d243bf823511..b3c2d03a301c 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 @@ -1,6 +1,6 @@ # Use case Configuration for bytcr-rt5640 -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { EnableSequence [ diff --git a/src/conf/ucm/bytcr-rt5640/HiFi.conf b/src/conf/ucm/bytcr-rt5640/HiFi.conf index c833fe74845b..97823e3684d2 100644 --- a/src/conf/ucm/bytcr-rt5640/HiFi.conf +++ b/src/conf/ucm/bytcr-rt5640/HiFi.conf @@ -1,6 +1,6 @@ # Use case Configuration for bytcr-rt5640 -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { EnableSequence [ 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 dd5b35fc02cb..391e977ddbd0 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 @@ -1,6 +1,6 @@ # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { EnableSequence [ 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 777ed7836ee5..f0b80194e39c 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 @@ -1,6 +1,6 @@ # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { EnableSequence [ 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 9f56c077b65a..049b2ebec9ad 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 @@ -1,6 +1,6 @@ # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { EnableSequence [ 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 e2a579ab2261..63570fb45fbb 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 @@ -1,6 +1,6 @@ # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { EnableSequence [ 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 ae52e7196110..85516cd23856 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 @@ -1,6 +1,6 @@ # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { EnableSequence [ 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 a73ff5f86b8f..1767906ffd99 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 @@ -1,6 +1,6 @@ # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { EnableSequence [ diff --git a/src/conf/ucm/bytcr-rt5651/HiFi.conf b/src/conf/ucm/bytcr-rt5651/HiFi.conf index 8733403cf28d..f254eac979cb 100644 --- a/src/conf/ucm/bytcr-rt5651/HiFi.conf +++ b/src/conf/ucm/bytcr-rt5651/HiFi.conf @@ -1,6 +1,6 @@ # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { EnableSequence [ diff --git a/src/conf/ucm/chtnau8824/HiFi.conf b/src/conf/ucm/chtnau8824/HiFi.conf index dc52800e5eaa..4bff322b33ee 100644 --- a/src/conf/ucm/chtnau8824/HiFi.conf +++ b/src/conf/ucm/chtnau8824/HiFi.conf @@ -1,4 +1,4 @@ -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { 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 799163dbe481..f9c64ea16bd5 100644 --- a/src/conf/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf +++ b/src/conf/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/HiFi.conf @@ -1,4 +1,4 @@ -<searchdir:ucm> +<searchdir:ucm-includes> SectionVerb { -- 2.19.1

3 3

[alsa-devel] [PATCH v2 01/13] conf/ucm: bytcr-rt5645: Use the generic bytcr/PlatformEnableSeq.conf
by Hans de Goede 28 Nov '18

28 Nov '18

Use the generic Intel SSP bytcr/PlatformEnableSeq.conf file, it is identical to all the cset statements this commit removes. Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- src/conf/ucm/chtrt5645/HiFi.conf | 116 +------------------------------ 1 file changed, 1 insertion(+), 115 deletions(-) diff --git a/src/conf/ucm/chtrt5645/HiFi.conf b/src/conf/ucm/chtrt5645/HiFi.conf index e81866cf..d993f6ae 100644 --- a/src/conf/ucm/chtrt5645/HiFi.conf +++ b/src/conf/ucm/chtrt5645/HiFi.conf @@ -11,121 +11,7 @@ SectionVerb { EnableSequence [ cdev "hw:chtrt5645" - # media mixer settings - # compress - cset "name='media0_in Gain 0 Switch' on" - cset "name='media0_in Gain 0 Volume' 0" - - # normal - cset "name='media1_in Gain 0 Switch' on" - cset "name='media1_in Gain 0 Volume' 0" - # swm loopback - cset "name='media2_in Gain 0 Switch' off" - cset "name='media2_in Gain 0 Volume' 0%" - # deep buffer - cset "name='media3_in Gain 0 Switch' on" - cset "name='media3_in Gain 0 Volume' 0" - - cset "name='media0_out mix 0 media0_in Switch' on" - cset "name='media0_out mix 0 media1_in Switch' on" - cset "name='media0_out mix 0 media2_in Switch' off" - cset "name='media0_out mix 0 media3_in Switch' on" - - cset "name='media1_out mix 0 media0_in Switch' off" - cset "name='media1_out mix 0 media1_in Switch' off" - cset "name='media1_out mix 0 media2_in Switch' off" - cset "name='media1_out mix 0 media3_in Switch' off" - - cset "name='pcm0_in Gain 0 Switch' on" - cset "name='pcm0_in Gain 0 Volume' 0" - - cset "name='pcm1_in Gain 0 Switch' off" - cset "name='pcm1_in Gain 0 Volume' 0%" - - # codec0_out settings (used if ssp2 is connected to aif1) - cset "name='codec_out0 mix 0 codec_in0 Switch' off" - cset "name='codec_out0 mix 0 codec_in1 Switch' off" - cset "name='codec_out0 mix 0 media_loop1_in Switch' off" - cset "name='codec_out0 mix 0 media_loop2_in Switch' off" - cset "name='codec_out0 mix 0 pcm0_in Switch' on" - cset "name='codec_out0 mix 0 pcm1_in Switch' off" - cset "name='codec_out0 mix 0 sprot_loop_in Switch' off" - cset "name='codec_out0 Gain 0 Switch' on" - cset "name='codec_out0 Gain 0 Volume' 0" - - # modem_out settings (used if ssp0 is connected to aif2) - cset "name='modem_out mix 0 codec_in0 Switch' off" - cset "name='modem_out mix 0 codec_in1 Switch' off" - cset "name='modem_out mix 0 media_loop1_in Switch' off" - cset "name='modem_out mix 0 media_loop2_in Switch' off" - cset "name='modem_out mix 0 pcm0_in Switch' on" - cset "name='modem_out mix 0 pcm1_in Switch' off" - cset "name='modem_out mix 0 sprot_loop_in Switch' off" - cset "name='modem_out Gain 0 Switch' on" - cset "name='modem_out Gain 0 Volume' 0" - - # input settings - # pcm1_out settings - - # input used when SSP2 is connected - cset "name='codec_in0 Gain 0 Switch' on" - cset "name='codec_in0 Gain 0 Volume' 0" - - # input used when SSP0 is connected - cset "name='modem_in Gain 0 Switch' on" - cset "name='modem_in Gain 0 Volume' 0" - - cset "name='pcm1_out mix 0 codec_in0 Switch' on" - cset "name='pcm1_out mix 0 modem_in Switch' on" - cset "name='pcm1_out mix 0 codec_in1 Switch' off" - cset "name='pcm1_out mix 0 media_loop1_in Switch' off" - cset "name='pcm1_out mix 0 media_loop2_in Switch' off" - cset "name='pcm1_out mix 0 pcm0_in Switch' off" - cset "name='pcm1_out mix 0 pcm1_in Switch' off" - cset "name='pcm1_out mix 0 sprot_loop_in Switch' off" - - cset "name='pcm1_out Gain 0 Switch' on" - cset "name='pcm1_out Gain 0 Volume' 0" - - # disable codec_out1 - cset "name='codec_out1 mix 0 codec_in0 Switch' off" - cset "name='codec_out1 mix 0 codec_in1 Switch' off" - cset "name='codec_out1 mix 0 media_loop1_in Switch' off" - cset "name='codec_out1 mix 0 media_loop2_in Switch' off" - cset "name='codec_out1 mix 0 pcm0_in Switch' off" - cset "name='codec_out1 mix 0 pcm1_in Switch' off" - cset "name='codec_out1 mix 0 sprot_loop_in Switch' off" - cset "name='codec_out1 Gain 0 Switch' off" - cset "name='codec_out1 Gain 0 Volume' 0%" - - # disable codec_in1 - cset "name='codec_in1 Gain 0 Switch' off" - cset "name='codec_in1 Gain 0 Volume' 0%" - - # disable all loops - cset "name='media_loop1_out mix 0 codec_in0 Switch' off" - cset "name='media_loop1_out mix 0 codec_in1 Switch' off" - cset "name='media_loop1_out mix 0 media_loop1_in Switch' off" - cset "name='media_loop1_out mix 0 media_loop2_in Switch' off" - cset "name='media_loop1_out mix 0 pcm0_in Switch' off" - cset "name='media_loop1_out mix 0 pcm1_in Switch' off" - cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off" - - cset "name='media_loop2_out mix 0 codec_in0 Switch' off" - cset "name='media_loop2_out mix 0 codec_in1 Switch' off" - cset "name='media_loop2_out mix 0 media_loop1_in Switch' off" - cset "name='media_loop2_out mix 0 media_loop2_in Switch' off" - cset "name='media_loop2_out mix 0 pcm0_in Switch' off" - cset "name='media_loop2_out mix 0 pcm1_in Switch' off" - cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off" - - cset "name='sprot_loop_out mix 0 codec_in0 Switch' off" - cset "name='sprot_loop_out mix 0 codec_in1 Switch' off" - cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off" - cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off" - cset "name='sprot_loop_out mix 0 pcm0_in Switch' off" - cset "name='sprot_loop_out mix 0 pcm1_in Switch' off" - cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off" + <bytcr/PlatformEnableSeq.conf> # Output Configuration cset "name='DAC1 L Mux' IF1 DAC" -- 2.18.0

6 30