ucm2: Qualcomm: add ASUS Zenbook A16 (UX3607OA)

This Glymur/X2 Elite Extreme laptop features:
- 4 speakers
- 2 DMICs (that notably return a square-ish wave at S16_LE)
- 3 HDMI/DP ports

This patch adds support to Speaker and DMICs for now.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/845
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Srinivas Kandagatla <srini@kernel.org>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/Qualcomm/glymur/ASUS-Zenbook-A16-UX3607OA.conf b/ucm2/Qualcomm/glymur/ASUS-Zenbook-A16-UX3607OA.conf
new file mode 100644 (file)
index 0000000..8621b33
--- /dev/null
+++ b/ucm2/Qualcomm/glymur/ASUS-Zenbook-A16-UX3607OA.conf
@@ -0,0 +1,11 @@
+Syntax 4
+
+SectionUseCase."HiFi" {
+       File "/Qualcomm/glymur/ZenbookA16-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/glymur/ZenbookA16-HiFi.conf b/ucm2/Qualcomm/glymur/ZenbookA16-HiFi.conf
new file mode 100755 (executable)
index 0000000..b1f2982
--- /dev/null
+++ b/ucm2/Qualcomm/glymur/ZenbookA16-HiFi.conf
@@ -0,0 +1,50 @@
+# Use case configuration for X1E80100.
+# Author: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+
+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/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},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 1baadc37e4b40c5a5fecec22f7ec2ffa0399c84e..1ded9d6a042caaa31616556e6eea1d82055b14c6 100644 (file)
--- a/ucm2/Qualcomm/glymur/glymur.conf
+++ b/ucm2/Qualcomm/glymur/glymur.conf
@@ -12,6 +12,16 @@ If.LENOVOSlim7x {
        True.Include.7x.File "/Qualcomm/glymur/LENOVO-Slim-7x.conf"
 }
 
+# 4x WSA Speakers | 2x Microphones | 3x DP/HDMI | 1x WCD Headset
+If.ASUSTeKZenbookA16 {
+       Condition {
+               Type RegexMatch
+               String "${var:DMI_info}"
+               Regex "ASUSTeK COMPUTER INC..*Zenbook A16.*UX3607OA"
+       }
+       True.Include.a16.File "/Qualcomm/glymur/ASUS-Zenbook-A16-UX3607OA.conf"
+}
+
 # 2x WSA Speakers | 2x Microphones | 3x DP/HDMI | 1x WCD Headset
 If.ASUSTeKZenbookA14 {
        Condition {