ucm2: Qualcomm: Add Dell Latitude 7455 / Inspiron 14 Plus

 7441 support

(Both SKUs are identical, the codename is Thena)

This configuration is:

- 4 speakers
- 2 DMICs
- headset with mic
- DisplayPort (not yet)

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/589
Signed-off-by: Val Packett <val@packett.cool>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/Qualcomm/x1e80100/Dell-Latitude-7455.conf b/ucm2/Qualcomm/x1e80100/Dell-Latitude-7455.conf
new file mode 100644 (file)
index 0000000..2b30e98
--- /dev/null
+++ b/ucm2/Qualcomm/x1e80100/Dell-Latitude-7455.conf
@@ -0,0 +1,13 @@
+Syntax 4
+
+SectionUseCase."HiFi" {
+       File "/Qualcomm/x1e80100/Latitude7455-HiFi.conf"
+       Comment "HiFi quality Music."
+}
+
+Include.card-init.File "/lib/card-init.conf"
+Include.ctl-remap.File "/lib/ctl-remap.conf"
+Include.wcd-init.File "/codecs/wcd938x/init.conf"
+Include.wsa-init.File "/codecs/wsa884x/four-speakers/init.conf"
+Include.wsam-init.File "/codecs/qcom-lpass/wsa-macro/four-speakers/init.conf"
+Include.rxm-init.File "/codecs/qcom-lpass/rx-macro/init.conf"

diff --git a/ucm2/Qualcomm/x1e80100/Latitude7455-HiFi.conf b/ucm2/Qualcomm/x1e80100/Latitude7455-HiFi.conf
new file mode 100644 (file)
index 0000000..fe5431f
--- /dev/null
+++ b/ucm2/Qualcomm/x1e80100/Latitude7455-HiFi.conf
@@ -0,0 +1,92 @@
+# Use case configuration for X1E80100.
+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+
+SectionVerb {
+       EnableSequence [
+               cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 1"
+               cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1"
+               cset "name='MultiMedia3 Mixer TX_CODEC_DMA_TX_3' 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."Headphones" {
+       Comment "Headphones playback"
+
+       Include.wcdhpe.File "/codecs/wcd938x/HeadphoneEnableSeq.conf"
+       Include.wcdhpd.File "/codecs/wcd938x/HeadphoneDisableSeq.conf"
+       Include.rxmhpe.File "/codecs/qcom-lpass/rx-macro/HeadphoneEnableSeq.conf"
+       Include.rxmhpd.File "/codecs/qcom-lpass/rx-macro/HeadphoneDisableSeq.conf"
+
+       EnableSequence [
+               cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 1"
+       ]
+
+       DisableSequence [
+               cset "name='RX_CODEC_DMA_RX_0 Audio Mixer MultiMedia1' 0"
+       ]
+
+       Value {
+               PlaybackPriority 200
+               PlaybackPCM "hw:${CardId},0"
+               PlaybackMixer "default:${CardId}"
+               PlaybackMixerElem "HP"
+               JackControl "Headphone Jack"
+       }
+}
+
+SectionDevice."Headset" {
+       Comment "Headset microphone"
+
+       Include.wcdmice.File "/codecs/wcd938x/HeadphoneMicEnableSeq.conf"
+       Include.wcdmicd.File "/codecs/wcd938x/HeadphoneMicDisableSeq.conf"
+       Include.txmhpe.File "/codecs/qcom-lpass/tx-macro/SoundwireMic1EnableSeq.conf"
+       Include.txmhpd.File "/codecs/qcom-lpass/tx-macro/SoundwireMicDisableSeq.conf"
+
+       Value {
+               CapturePriority 200
+               CapturePCM "hw:${CardId},2"
+               CaptureMixerElem "ADC2"
+               JackControl "Mic Jack"
+       }
+}
+
+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 ecbb13d7e02a7ad3912066343f553ffc4eb7d2c4..654d5dbaada03db3a7755dc6fd0164e90eb63631 100644 (file)
--- a/ucm2/Qualcomm/x1e80100/x1e80100.conf
+++ b/ucm2/Qualcomm/x1e80100/x1e80100.conf
@@ -19,3 +19,12 @@ If.LENOVOSlim7x {
        }
        True.Include.7x.File "/Qualcomm/x1e80100/LENOVO-Slim-7x.conf"
 }
+
+If.DellLatitude7455 {
+       Condition {
+               Type RegexMatch
+               String "${var:DMI_info}"
+               Regex "Dell Inc.*(Latitude|Inspiron).*"
+       }
+       True.Include.latitude.File "/Qualcomm/x1e80100/Dell-Latitude-7455.conf"
+}