The headphones can either be driven directly from DAC1, or through the HP volume mixer chain to allow volume control, both can be enabled at the same time, but this should not be done.
Mix only DAC1 to the headphones and not the HP volume path, there are 2 reasons to choice the DAC1 path; 1) It is the power-on-reset default 2) We don't expose the volume control to e.g. pulseaudio anyways so it is not useful
While at it also move the "HPO MIX DAC1" and "HPO MIX HPVOL" entries up a bit so that they are no longer inbetween the "HPO L Playback Switch" and "HPO R Playback Switch" entries.
Reviewed-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Signed-off-by: Hans de Goede hdegoede@redhat.com --- src/conf/ucm/bytcr-rt5651/HiFi.conf | 2 -- src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/conf/ucm/bytcr-rt5651/HiFi.conf b/src/conf/ucm/bytcr-rt5651/HiFi.conf index 8ded2d52..bc604276 100644 --- a/src/conf/ucm/bytcr-rt5651/HiFi.conf +++ b/src/conf/ucm/bytcr-rt5651/HiFi.conf @@ -30,7 +30,6 @@ SectionDevice."Headphones" { cset "name='Headphone Switch' on" cset "name='HPO L Playback Switch' on" cset "name='HPO R Playback Switch' on" - cset "name='HP Playback Volume' 100" ]
DisableSequence [ @@ -39,7 +38,6 @@ SectionDevice."Headphones" { cset "name='Headphone Switch' off" cset "name='HPO L Playback Switch' off" cset "name='HPO R Playback Switch' off" - cset "name='HP Playback Volume' 0" ]
Value { diff --git a/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf b/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf index 069427b7..3bf7f69a 100644 --- a/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf +++ b/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf @@ -99,10 +99,10 @@ SectionDefaults [
# default state cset "name='ADC Capture Volume' 126" + cset "name='HPO MIX DAC1 Switch' on" + cset "name='HPO MIX HPVOL Switch' off" cset "name='HP Playback Volume' 0" cset "name='HPO L Playback Switch' off" - cset "name='HPO MIX DAC1 Switch' on" - cset "name='HPO MIX HPVOL Switch' on" cset "name='HPO R Playback Switch' off" cset "name='HPOVOL L Switch' on" cset "name='HPOVOL R Switch' on"