ucm2: Qualcomm: add Dell XPS 9345

Add a new target with extended regex string. Device is mostly
compatible with Yoga Slim7x, however features only x2 not x3 DP audio
outputs (USB Type-C). As upcoming DP audio addition will require
config separation, create a dedicated config right away.

x4 speakers, x2 DMICs, x2 DP, no headphone jack/WCD codec.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/587
Signed-off-by: Aleksandrs Vinarskis <alex@vinarskis.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/Qualcomm/x1e80100/Dell-Xps-9345.conf b/ucm2/Qualcomm/x1e80100/Dell-Xps-9345.conf
new file mode 100644 (file)
index 0000000..d012a6f
--- /dev/null
+++ b/ucm2/Qualcomm/x1e80100/Dell-Xps-9345.conf
@@ -0,0 +1,11 @@
+Syntax 4
+
+SectionUseCase."HiFi" {
+       File "/Qualcomm/x1e80100/Xps9345-HiFi.conf"
+       Comment "HiFi quality Music."
+}
+
+Include.card-init.File "/lib/card-init.conf"
+Include.ctl-remap.File "/lib/ctl-remap.conf"
+Include.wsa-init.File "/codecs/wsa884x/four-speakers/init.conf"
+Include.wsam-init.File "/codecs/qcom-lpass/wsa-macro/four-speakers/init.conf"

diff --git a/ucm2/Qualcomm/x1e80100/Xps9345-HiFi.conf b/ucm2/Qualcomm/x1e80100/Xps9345-HiFi.conf
new file mode 100644 (file)
index 0000000..38b9809
--- /dev/null
+++ b/ucm2/Qualcomm/x1e80100/Xps9345-HiFi.conf
@@ -0,0 +1,49 @@
+# Use case configuration for X1E80100.
+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+
+SectionVerb {
+       EnableSequence [
+               cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1"
+               cset "name='MultiMedia4 Mixer VA_CODEC_DMA_TX_0' 1"
+       ]
+
+       Include.wsae.File "/codecs/wsa884x/four-speakers/DefaultEnableSeq.conf"
+       Include.wsm1e.File "/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf"
+       Include.wsm2e.File "/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerEnableSeq.conf"
+
+       Value {
+               TQ "HiFi"
+       }
+}
+
+SectionDevice."Speaker" {
+       Comment "Speaker playback"
+
+       Include.wsmspk1e.File "/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf"
+       Include.wsmspk2e.File "/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerEnableSeq.conf"
+       Include.wsmspk1d.File "/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerDisableSeq.conf"
+       Include.wsmspk2d.File "/codecs/qcom-lpass/wsa-macro/Wsa2SpeakerDisableSeq.conf"
+       Include.wsaspk.File "/codecs/wsa884x/four-speakers/SpeakerSeq.conf"
+
+       Value {
+               PlaybackChannels 4
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId},1"
+               PlaybackMixer "default:${CardId}"
+               PlaybackMixerElem "Speakers"
+       }
+}
+
+SectionDevice."Mic" {
+       Comment "Internal microphones"
+
+       Include.vadm0e.File "/codecs/qcom-lpass/va-macro/DMIC0EnableSeq.conf"
+       Include.vadm0d.File "/codecs/qcom-lpass/va-macro/DMIC0DisableSeq.conf"
+       Include.vadm1e.File "/codecs/qcom-lpass/va-macro/DMIC1EnableSeq.conf"
+       Include.vadm1d.File "/codecs/qcom-lpass/va-macro/DMIC1DisableSeq.conf"
+
+       Value {
+               CapturePriority 100
+               CapturePCM "hw:${CardId},3"
+       }
+}

diff --git a/ucm2/Qualcomm/x1e80100/x1e80100.conf b/ucm2/Qualcomm/x1e80100/x1e80100.conf
index 04c71c8c7f8bc92a72d1fc49951ea1339ba8a362..68b8fc255e1d367cb7976cb20c5613bd0e02c305 100644 (file)
--- a/ucm2/Qualcomm/x1e80100/x1e80100.conf
+++ b/ucm2/Qualcomm/x1e80100/x1e80100.conf
@@ -41,3 +41,13 @@ If.DellLatitude7455 {
        }
        True.Include.latitude.File "/Qualcomm/x1e80100/Dell-Latitude-7455.conf"
 }
+
+# 4x WSA Speakers | 2x Microphones | 2x DP/HDMI
+If.DellXps9345 {
+       Condition {
+               Type RegexMatch
+               String "${var:DMI_info}-${sys:devices/virtual/dmi/id/product_name}"
+               Regex "Dell Inc.*XPS 13 9345.*"
+       }
+       True.Include.xps.File "/Qualcomm/x1e80100/Dell-Xps-9345.conf"
+}