From c4d6a395ea271cd273b439f77426b0decfb54094 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 2 Apr 2022 07:03:06 -0300 Subject: [PATCH] ucm2: sof-essx8336: use the right mixers for speaker/headphone On es8316 and es8336, both speaker and headphone share the same mixer. Adjust the controls to reflect the actual control names, at the same way as bytcht-es8316. Fixes: https://github.com/alsa-project/alsa-ucm-conf/pull/144 Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jaroslav Kysela --- ucm2/Intel/sof-essx8336/HiFi.conf | 44 ++++++++++++++----------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/ucm2/Intel/sof-essx8336/HiFi.conf b/ucm2/Intel/sof-essx8336/HiFi.conf index 1a57a2b..fc155f8 100644 --- a/ucm2/Intel/sof-essx8336/HiFi.conf +++ b/ucm2/Intel/sof-essx8336/HiFi.conf @@ -21,18 +21,21 @@ If.amic { "Headset" ] - Value { - CapturePriority 100 - CapturePCM "hw:${CardId}" - } - EnableSequence [ + cset "name='Differential Mux' lin1-rin1" cset "name='Internal Mic Switch' on" ] DisableSequence [ cset "name='Internal Mic Switch' off" ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId}" + CaptureMixerElem "ADC PGA Gain" + CaptureMasterElem "ADC" + } } } @@ -65,7 +68,7 @@ If.dmic { } SectionDevice."Speaker" { - Comment "Speaker" + Comment "Speakers" ConflictingDevice [ "Headphones" @@ -81,10 +84,10 @@ SectionDevice."Speaker" { Value { PlaybackPriority 100 PlaybackPCM "hw:${CardId}" - PlaybackMixerElem "Speaker" - PlaybackMasterElem "Master" - PlaybackVolume "Speaker Volume" - PlaybackSwitch "Speaker Switch" + # The es8316 only has a HP-amp which is muxed to the speaker + # or to the headpones output + PlaybackMixerElem "Headphone Mixer" + PlaybackMasterElem "DAC" } } @@ -95,21 +98,11 @@ SectionDevice."Headphones" { "Speaker" ] - EnableSequence [ - cset "name='Headphone Switch' on" - ] - - DisableSequence [ - cset "name='Headphone Switch' off" - ] - Value { PlaybackPriority 300 PlaybackPCM "hw:${CardId}" - PlaybackMixerElem "Headphone" - PlaybackMasterElem "Master" - PlaybackVolume "Headphone Volume" - PlaybackSwitch "Headphone Switch" + PlaybackMixerElem "Headphone Mixer" + PlaybackMasterElem "DAC" JackControl "Headphone Jack" JackHWMute "Speaker" } @@ -129,16 +122,19 @@ SectionDevice."Headset" { } EnableSequence [ - cset "name='Headset Mic Switch' on" + cset "name='Headset Switch' on" + cset "name='Digital Mic Mux' 'dmic disable'" ] DisableSequence [ - cset "name='Headset Mic Switch' off" + cset "name='Headset Switch' on" ] Value { CapturePriority 300 CapturePCM "hw:${CardId}" + CaptureMixerElem "ADC PGA Gain" + CaptureMasterElem "ADC" JackControl "Headset Mic Jack" } } -- 2.47.1