From f81fdee0846e1c6a9a462b7d3c8d5be98664ca7f Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Mon, 27 Jun 2022 15:05:47 -0500 Subject: [PATCH 1/2] ucm2: sof-soundwire: rt711: use codec volume/switch instead of SOF ones When possible, it's better to use the codec volume and switch. The firmware PGA is provided mostly for testing. Signed-off-by: Pierre-Louis Bossart --- ucm2/sof-soundwire/rt711.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ucm2/sof-soundwire/rt711.conf b/ucm2/sof-soundwire/rt711.conf index 5300cf99..63f9d21e 100644 --- a/ucm2/sof-soundwire/rt711.conf +++ b/ucm2/sof-soundwire/rt711.conf @@ -22,18 +22,18 @@ SectionDevice."Headset" { Comment "Headset Microphone" EnableSequence [ - cset "name='PGA2.0 2 Master Capture Switch' 1" + cset "name='rt711 ADC 08 Capture Switch' 1" ] DisableSequence [ - cset "name='PGA2.0 2 Master Capture Switch' 0" + cset "name='rt711 ADC 08 Capture Switch' 0" ] Value { CapturePriority 200 CapturePCM "hw:${CardId},1" JackControl "Headset Mic Jack" - CaptureSwitch "PGA2.0 2 Master Capture Switch" - CaptureVolume "PGA2.0 2 Master Capture Volume" + CaptureSwitch "rt711 ADC 08 Capture Switch" + CaptureVolume "rt711 ADC 08 Capture Volume" } } From 7bc9b73020c62607a44ee5b4346ace2b19fa7ada Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Mon, 27 Jun 2022 15:07:43 -0500 Subject: [PATCH 2/2] ucm2: sof-soundwire: rt711-sdca: use codec volume/switch consistently We already use CaptureSwitch "rt711 FU0F Capture Switch" CaptureVolume "rt711 FU0F Capture Volume" but the enable/disable sequences used the SOF 'PGA2.0 2 Master Capture Switch' Signed-off-by: Pierre-Louis Bossart --- ucm2/sof-soundwire/rt711-sdca.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ucm2/sof-soundwire/rt711-sdca.conf b/ucm2/sof-soundwire/rt711-sdca.conf index 3006dc9c..a8e555ef 100644 --- a/ucm2/sof-soundwire/rt711-sdca.conf +++ b/ucm2/sof-soundwire/rt711-sdca.conf @@ -22,11 +22,11 @@ SectionDevice."Headset" { Comment "Headset Microphone" EnableSequence [ - cset "name='PGA2.0 2 Master Capture Switch' 1" + cset "name='rt711 FU0F Capture Switch' 1" ] DisableSequence [ - cset "name='PGA2.0 2 Master Capture Switch' 0" + cset "name='rt711 FU0F Capture Switch' 0" ] Value {