From d5c17abadba6ff0cf71e95d36ba890631fa686ea Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Fri, 20 Nov 2020 12:12:48 +0000 Subject: [PATCH 1/2] ucm2: codecs: lpass: add codec sequences for wsa and va macro Add enable/disable codec sequence for Qualcomm Low Power Audio Subsystem (LPASS) Codec WSA and VA Macros. Signed-off-by: Srinivas Kandagatla --- ucm2/codecs/lpass/va-macro/DMIC0DisableSeq.conf | 5 +++++ ucm2/codecs/lpass/va-macro/DMIC0EnableSeq.conf | 5 +++++ ucm2/codecs/lpass/wsa-macro/SpeakerDisableSeq.conf | 10 ++++++++++ ucm2/codecs/lpass/wsa-macro/SpeakerEnableSeq.conf | 10 ++++++++++ 4 files changed, 30 insertions(+) create mode 100644 ucm2/codecs/lpass/va-macro/DMIC0DisableSeq.conf create mode 100644 ucm2/codecs/lpass/va-macro/DMIC0EnableSeq.conf create mode 100644 ucm2/codecs/lpass/wsa-macro/SpeakerDisableSeq.conf create mode 100644 ucm2/codecs/lpass/wsa-macro/SpeakerEnableSeq.conf diff --git a/ucm2/codecs/lpass/va-macro/DMIC0DisableSeq.conf b/ucm2/codecs/lpass/va-macro/DMIC0DisableSeq.conf new file mode 100644 index 00000000..ec3f45aa --- /dev/null +++ b/ucm2/codecs/lpass/va-macro/DMIC0DisableSeq.conf @@ -0,0 +1,5 @@ +DisableSequence [ + cset "name='VA DMIC MUX0' ZERO" + cset "name='VA_DEC0 Volume' 0" + cset "name='VA_AIF1_CAP Mixer DEC0' 0" +] diff --git a/ucm2/codecs/lpass/va-macro/DMIC0EnableSeq.conf b/ucm2/codecs/lpass/va-macro/DMIC0EnableSeq.conf new file mode 100644 index 00000000..bd6e8f58 --- /dev/null +++ b/ucm2/codecs/lpass/va-macro/DMIC0EnableSeq.conf @@ -0,0 +1,5 @@ +EnableSequence [ + cset "name='VA DMIC MUX0' DMIC0" + cset "name='VA_AIF1_CAP Mixer DEC0' 1" + cset "name='VA_DEC0 Volume' 100" +] diff --git a/ucm2/codecs/lpass/wsa-macro/SpeakerDisableSeq.conf b/ucm2/codecs/lpass/wsa-macro/SpeakerDisableSeq.conf new file mode 100644 index 00000000..1f27d4ce --- /dev/null +++ b/ucm2/codecs/lpass/wsa-macro/SpeakerDisableSeq.conf @@ -0,0 +1,10 @@ +DisableSequence [ + cset "name='WSA_RX0 Digital Volume' 0" + cset "name='WSA_RX1 Digital Volume' 0" + cset "name='WSA_COMP1 Switch' 0" + cset "name='WSA_COMP2 Switch' 0" + cset "name='WSA_RX0 INP0' ZERO" + cset "name='WSA_RX1 INP0' ZERO" + cset "name='WSA RX0 MUX' ZERO" + cset "name='WSA RX1 MUX' ZERO" +] diff --git a/ucm2/codecs/lpass/wsa-macro/SpeakerEnableSeq.conf b/ucm2/codecs/lpass/wsa-macro/SpeakerEnableSeq.conf new file mode 100644 index 00000000..618bab45 --- /dev/null +++ b/ucm2/codecs/lpass/wsa-macro/SpeakerEnableSeq.conf @@ -0,0 +1,10 @@ +EnableSequence [ + cset "name='WSA RX0 MUX' AIF1_PB" + cset "name='WSA RX1 MUX' AIF1_PB" + cset "name='WSA_RX0 INP0' RX0" + cset "name='WSA_RX1 INP0' RX1" + cset "name='WSA_COMP1 Switch' 1" + cset "name='WSA_COMP2 Switch' 1" + cset "name='WSA_RX0 Digital Volume' 68" + cset "name='WSA_RX1 Digital Volume' 68" +] From 84160be627958c1cbc703100df371894cccecd98 Mon Sep 17 00:00:00 2001 From: Srinivas Kandagatla Date: Fri, 20 Nov 2020 12:14:31 +0000 Subject: [PATCH 2/2] ucm2: add support to for Qualcomm RB5 Platform The Qualcomm RB5 Robotics Platform contains HDMI, 2x WSA Smart-Speakers audio outputs along with One Onboard DMIC audio input. Signed-off-by: Srinivas Kandagatla --- ucm2/sm8250/HDMI.conf | 26 +++++++++++ ucm2/sm8250/HiFi.conf | 46 +++++++++++++++++++ .../Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf | 11 +++++ 3 files changed, 83 insertions(+) create mode 100644 ucm2/sm8250/HDMI.conf create mode 100644 ucm2/sm8250/HiFi.conf create mode 100644 ucm2/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf diff --git a/ucm2/sm8250/HDMI.conf b/ucm2/sm8250/HDMI.conf new file mode 100644 index 00000000..a9594fd9 --- /dev/null +++ b/ucm2/sm8250/HDMI.conf @@ -0,0 +1,26 @@ +# Use case configuration for RB5 board. +# Author: Srinivas Kandagatla + +SectionVerb { + EnableSequence [ + cset "name='TERT_MI2S_RX Audio Mixer MultiMedia1' 1" + ] + + DisableSequence [ + cset "name='TERT_MI2S_RX Audio Mixer MultiMedia1' 0" + ] + + Value { + TQ "HiFi" + } +} + +SectionDevice."HDMI" { + #Name "HDMI" + Comment "HDMI Digital Stereo Output" + + Value { + PlaybackPCM "hw:${CardId}" + PlaybackPriority 200 + } +} diff --git a/ucm2/sm8250/HiFi.conf b/ucm2/sm8250/HiFi.conf new file mode 100644 index 00000000..a310402e --- /dev/null +++ b/ucm2/sm8250/HiFi.conf @@ -0,0 +1,46 @@ +# Use case configuration for Qualcomm RB5. +# Author: Srinivas Kandagatla + +SectionVerb { + + EnableSequence [ + cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1" + cset "name='MultiMedia3 Mixer VA_CODEC_DMA_TX_0' 1" + ] + + Include.wsae.File "/codecs/wsa881x/DefaultEnableSeq.conf" + + DisableSequence [ + cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 0" + cset "name='MultiMedia3 Mixer VA_CODEC_DMA_TX_0' 0" + ] + + Value { + TQ "HiFi" + } +} + +SectionDevice."Speaker" { + Comment "Speaker playback" + + Include.lpasswsae.File "/codecs/lpass/wsa-macro/SpeakerEnableSeq.conf" + Include.wsae.File "/codecs/wsa881x/SpeakerEnableSeq.conf" + Include.wsad.File "/codecs/wsa881x/SpeakerDisableSeq.conf" + Include.lpasswsad.File "/codecs/lpass/wsa-macro/SpeakerDisableSeq.conf" + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},1" + } +} + +SectionDevice."Mic" { + Comment "Mic" + Include.lpassvad.File "/codecs/lpass/va-macro/DMIC0EnableSeq.conf" + Include.lpassvad.File "/codecs/lpass/va-macro/DMIC0DisableSeq.conf" + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},2" + } +} diff --git a/ucm2/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf b/ucm2/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf new file mode 100644 index 00000000..2fbca311 --- /dev/null +++ b/ucm2/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf @@ -0,0 +1,11 @@ +Syntax 3 + +SectionUseCase."HiFi" { + File "/Qualcomm/sm8250/HiFi.conf" + Comment "HiFi quality Music." +} + +SectionUseCase."HDMI" { + File "/Qualcomm/sm8250/HDMI.conf" + Comment "HDMI output." +}