ucm2: Qualcomm: Add Asus Zenbook A14 (UX3407NA)

The Asus Zenbook A14 (UX3407NA) is a Qualcomm Glymur-based laptop
featuring:

- 2 speakers
- 2 DMICs
- 3 HDMI/DP ports
- Headphone jack

Add support for speakers and DMICs for now, as work is still pending for
the others.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/858
Signed-off-by: Bjorn Andersson <bjorn.andersson@oss.qualcomm.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/Qualcomm/glymur/ASUS-Zenbook-A14-UX3407NA.conf b/ucm2/Qualcomm/glymur/ASUS-Zenbook-A14-UX3407NA.conf
new file mode 100644 (file)
index 0000000..90acc42
--- /dev/null
+++ b/ucm2/Qualcomm/glymur/ASUS-Zenbook-A14-UX3407NA.conf
@@ -0,0 +1,11 @@
+Syntax 4
+
+SectionUseCase."HiFi" {
+       File "/Qualcomm/glymur/ZenbookA14-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/two-speakers/init.conf"
+Include.wsam-init.File "/codecs/qcom-lpass/wsa-macro/two-speakers/init.conf"

diff --git a/ucm2/Qualcomm/glymur/ZenbookA14-HiFi.conf b/ucm2/Qualcomm/glymur/ZenbookA14-HiFi.conf
new file mode 100755 (executable)
index 0000000..0a9cb86
--- /dev/null
+++ b/ucm2/Qualcomm/glymur/ZenbookA14-HiFi.conf
@@ -0,0 +1,46 @@
+# Use case configuration for Asus Zenbook A14 (UX3407NA).
+
+SectionVerb {
+       EnableSequence [
+               cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 1"
+               cset "name='MultiMedia2 Mixer VA_CODEC_DMA_TX_0' 1"
+       ]
+
+       Include.wsae.File "/codecs/wsa884x/two-speakers/DefaultEnableSeq.conf"
+       Include.wsm1e.File "/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf"
+
+       Value {
+               TQ "HiFi"
+       }
+}
+
+SectionDevice."Speaker" {
+       Comment "Speaker playback"
+
+       Include.wsmspk1e.File "/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerEnableSeq.conf"
+       Include.wsmspk1d.File "/codecs/qcom-lpass/wsa-macro/Wsa1SpeakerDisableSeq.conf"
+       Include.wsaspk.File "/codecs/wsa884x/two-speakers/SpeakerSeq.conf"
+
+       Value {
+               PlaybackChannels 2
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId},0"
+               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},1"
+               Format S32_LE
+       }
+}

diff --git a/ucm2/Qualcomm/glymur/glymur.conf b/ucm2/Qualcomm/glymur/glymur.conf
index f0f016e46477d2143309ffc6d423734d7e96a12c..1baadc37e4b40c5a5fecec22f7ec2ffa0399c84e 100644 (file)
--- a/ucm2/Qualcomm/glymur/glymur.conf
+++ b/ucm2/Qualcomm/glymur/glymur.conf
@@ -11,3 +11,13 @@ If.LENOVOSlim7x {
        }
        True.Include.7x.File "/Qualcomm/glymur/LENOVO-Slim-7x.conf"
 }
+
+# 2x WSA Speakers | 2x Microphones | 3x DP/HDMI | 1x WCD Headset
+If.ASUSTeKZenbookA14 {
+       Condition {
+               Type RegexMatch
+               String "${var:DMI_info}"
+               Regex "ASUSTeK COMPUTER INC..*Zenbook A14.*UX3407NA"
+       }
+       True.Include.a14.File "/Qualcomm/glymur/ASUS-Zenbook-A14-UX3407NA.conf"
+}

diff --git a/ucm2/codecs/qcom-lpass/wsa-macro/two-speakers/init.conf b/ucm2/codecs/qcom-lpass/wsa-macro/two-speakers/init.conf
new file mode 100644 (file)
index 0000000..33e6bb9
--- /dev/null
+++ b/ucm2/codecs/qcom-lpass/wsa-macro/two-speakers/init.conf
@@ -0,0 +1,8 @@
+# WSA Digital codec specific volume control settings
+
+BootSequence [
+       cset "name='WSA WSA_RX0 Digital Volume' 84"
+       cset "name='WSA WSA_RX1 Digital Volume' 84"
+       cset "name='WSA WSA_COMP1 Switch' 0"
+       cset "name='WSA WSA_COMP2 Switch' 0"
+]