pool/alsa
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
alsa/0003-conf-ucm-chtrt5645-Cleanup-and-playback-fixes.patch
Tomáš Chvátal c45adc86c9 Accepting request 603189 from home:tiwai:branches:multimedia:libs 
- Backport UCM fix and new profiles from upstream (bsc#1091678):
  0001-ucm-adding-the-folder-of-card_long_name-when-finding.patch
  0002-conf-ucm-increase-the-input-volume-for-LineIn.patch
  0003-conf-ucm-chtrt5645-Cleanup-and-playback-fixes.patch
  0004-conf-ucm-chtrt5645-Microphone-recording-fixes.patch
  0005-conf-ucm-chtrt5645-Fix-recording-from-internal-analo.patch
  0006-conf-ucm-chtrt5645-At-config-for-the-Asus-T100HA.patch
  0007-conf-ucm-chtrt5645-At-config-for-the-Lenovo-Ideapad-.patch
  0008-conf-ucm-Add-a-UCM-profile-for-Dell-WD15-Dock-USB-au.patch

OBS-URL: https://build.opensuse.org/request/show/603189
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=233
2018-05-02 17:22:09 +00:00

240 lines
8.8 KiB
Diff
Raw Blame History

From f7c38c29d1be8bab9dd4f406aea3b0e9151c1c06 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Sat, 28 Apr 2018 21:51:56 +0200
Subject: [PATCH] conf/ucm: chtrt5645: Cleanup and playback fixes
Apply cleanup and playback fixes changes from:
https://github.com/plbossart/UCM.git
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
[hdegoede@redhat.com: Modify commit msg and paths for merging into alsa-lib]
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
src/conf/ucm/chtrt5645/HiFi.conf | 157 ++++++++++++++++++++++++++++++++-------
1 file changed, 129 insertions(+), 28 deletions(-)
diff --git a/src/conf/ucm/chtrt5645/HiFi.conf b/src/conf/ucm/chtrt5645/HiFi.conf
index 0c2c83cc72b1..f63392d476ed 100644
--- a/src/conf/ucm/chtrt5645/HiFi.conf
+++ b/src/conf/ucm/chtrt5645/HiFi.conf
@@ -11,51 +11,146 @@ SectionVerb {
EnableSequence [
cdev "hw:chtrt5645"
- # Enable audio output path
- cset "name='codec_out1 mix 0 pcm0_in Switch' on"
- cset "name='media0_out mix 0 media1_in Switch' on"
+ # media mixer settings
+ # compress
+ cset "name='media0_in Gain 0 Switch' on"
+ cset "name='media0_in Gain 0 Volume' 0"
- cset "name='media1_in Gain 0 Ramp Delay' 50"
+ # normal
cset "name='media1_in Gain 0 Switch' on"
- cset "name='media1_in Gain 0 Volume' 80% 80%"
+ cset "name='media1_in Gain 0 Volume' 0"
+ # swm loopback
+ cset "name='media2_in Gain 0 Switch' off"
+ cset "name='media2_in Gain 0 Volume' 0%"
+ # deep buffer
+ cset "name='media3_in Gain 0 Switch' on"
+ cset "name='media3_in Gain 0 Volume' 0"
+
+ cset "name='media0_out mix 0 media0_in Switch' on"
+ cset "name='media0_out mix 0 media1_in Switch' on"
+ cset "name='media0_out mix 0 media2_in Switch' off"
+ cset "name='media0_out mix 0 media3_in Switch' on"
+
+ cset "name='media1_out mix 0 media0_in Switch' off"
+ cset "name='media1_out mix 0 media1_in Switch' off"
+ cset "name='media1_out mix 0 media2_in Switch' off"
+ cset "name='media1_out mix 0 media3_in Switch' off"
- cset "name='pcm0_in Gain 0 Ramp Delay' 50"
cset "name='pcm0_in Gain 0 Switch' on"
- cset "name='pcm0_in Gain 0 Volume' 80% 80%"
+ cset "name='pcm0_in Gain 0 Volume' 0"
+
+ cset "name='pcm1_in Gain 0 Switch' off"
+ cset "name='pcm1_in Gain 0 Volume' 0%"
+
+ # codec0_out settings (used if ssp2 is connected to aif1)
+ cset "name='codec_out0 mix 0 codec_in0 Switch' off"
+ cset "name='codec_out0 mix 0 codec_in1 Switch' off"
+ cset "name='codec_out0 mix 0 media_loop1_in Switch' off"
+ cset "name='codec_out0 mix 0 media_loop2_in Switch' off"
+ cset "name='codec_out0 mix 0 pcm0_in Switch' on"
+ cset "name='codec_out0 mix 0 pcm1_in Switch' off"
+ cset "name='codec_out0 mix 0 sprot_loop_in Switch' off"
+ cset "name='codec_out0 Gain 0 Switch' on"
+ cset "name='codec_out0 Gain 0 Volume' 0"
+
+ # modem_out settings (used if ssp0 is connected to aif2)
+ cset "name='modem_out mix 0 codec_in0 Switch' off"
+ cset "name='modem_out mix 0 codec_in1 Switch' off"
+ cset "name='modem_out mix 0 media_loop1_in Switch' off"
+ cset "name='modem_out mix 0 media_loop2_in Switch' off"
+ cset "name='modem_out mix 0 pcm0_in Switch' on"
+ cset "name='modem_out mix 0 pcm1_in Switch' off"
+ cset "name='modem_out mix 0 sprot_loop_in Switch' off"
+ cset "name='modem_out Gain 0 Switch' on"
+ cset "name='modem_out Gain 0 Volume' 0"
+
+ # input settings
+ # pcm1_out settings
+
+ # input used when SSP2 is connected
+ cset "name='codec_in0 Gain 0 Switch' on"
+ cset "name='codec_in0 Gain 0 Volume' 0"
- cset "name='codec_out1 Gain 0 Ramp Delay' 50"
- cset "name='codec_out1 Gain 0 Switch' on"
- cset "name='codec_out1 Gain 0 Volume' 70% 70%"
+ # input used when SSP0 is connected
+ cset "name='modem_in Gain 0 Switch' on"
+ cset "name='modem_in Gain 0 Volume' 0"
- # Enable audio input path
- cset "name='pcm1_out mix 0 media_loop2_in Switch' on"
- cset "name='media_loop2_out mix 0 codec_in0 Switch' on"
+ cset "name='pcm1_out mix 0 codec_in0 Switch' on"
+ cset "name='pcm1_out mix 0 modem_in Switch' on"
+ cset "name='pcm1_out mix 0 codec_in1 Switch' off"
+ cset "name='pcm1_out mix 0 media_loop1_in Switch' off"
+ cset "name='pcm1_out mix 0 media_loop2_in Switch' off"
+ cset "name='pcm1_out mix 0 pcm0_in Switch' off"
+ cset "name='pcm1_out mix 0 pcm1_in Switch' off"
+ cset "name='pcm1_out mix 0 sprot_loop_in Switch' off"
- cset "name='codec_in0 Gain 0 Ramp Delay' 50"
- cset "name='codec_in0 Gain 0 Switch' on"
- cset "name='codec_in0 Gain 0 Volume' 80% 80%"
+ cset "name='pcm1_out Gain 0 Switch' on"
+ cset "name='pcm1_out Gain 0 Volume' 0"
- cset "name='media_loop2_out Gain 0 Ramp Delay' 50"
- cset "name='media_loop2_out Gain 0 Switch' on"
- cset "name='media_loop2_out Gain 0 Volume' 80% 80%"
+ # disable codec_out1
+ cset "name='codec_out1 mix 0 codec_in0 Switch' off"
+ cset "name='codec_out1 mix 0 codec_in1 Switch' off"
+ cset "name='codec_out1 mix 0 media_loop1_in Switch' off"
+ cset "name='codec_out1 mix 0 media_loop2_in Switch' off"
+ cset "name='codec_out1 mix 0 pcm0_in Switch' off"
+ cset "name='codec_out1 mix 0 pcm1_in Switch' off"
+ cset "name='codec_out1 mix 0 sprot_loop_in Switch' off"
+ cset "name='codec_out1 Gain 0 Switch' off"
+ cset "name='codec_out1 Gain 0 Volume' 0%"
- cset "name='pcm1_out Gain 0 Ramp Delay' 50"
- cset "name='pcm1_out Gain 0 Switch' on"
- cset "name='pcm1_out Gain 0 Volume' 80% 80%"
+ # disable codec_in1
+ cset "name='codec_in1 Gain 0 Switch' off"
+ cset "name='codec_in1 Gain 0 Volume' 0%"
+
+ # disable all loops
+ cset "name='media_loop1_out mix 0 codec_in0 Switch' off"
+ cset "name='media_loop1_out mix 0 codec_in1 Switch' off"
+ cset "name='media_loop1_out mix 0 media_loop1_in Switch' off"
+ cset "name='media_loop1_out mix 0 media_loop2_in Switch' off"
+ cset "name='media_loop1_out mix 0 pcm0_in Switch' off"
+ cset "name='media_loop1_out mix 0 pcm1_in Switch' off"
+ cset "name='media_loop1_out mix 0 sprot_loop_in Switch' off"
+
+ cset "name='media_loop2_out mix 0 codec_in0 Switch' off"
+ cset "name='media_loop2_out mix 0 codec_in1 Switch' off"
+ cset "name='media_loop2_out mix 0 media_loop1_in Switch' off"
+ cset "name='media_loop2_out mix 0 media_loop2_in Switch' off"
+ cset "name='media_loop2_out mix 0 pcm0_in Switch' off"
+ cset "name='media_loop2_out mix 0 pcm1_in Switch' off"
+ cset "name='media_loop2_out mix 0 sprot_loop_in Switch' off"
+
+ cset "name='sprot_loop_out mix 0 codec_in0 Switch' off"
+ cset "name='sprot_loop_out mix 0 codec_in1 Switch' off"
+ cset "name='sprot_loop_out mix 0 media_loop1_in Switch' off"
+ cset "name='sprot_loop_out mix 0 media_loop2_in Switch' off"
+ cset "name='sprot_loop_out mix 0 pcm0_in Switch' off"
+ cset "name='sprot_loop_out mix 0 pcm1_in Switch' off"
+ cset "name='sprot_loop_out mix 0 sprot_loop_in Switch' off"
# Output Configuration
- cset "name='DAC L2 Mux' 'IF1 DAC'"
- cset "name='DAC R2 Mux' 'IF1 DAC'"
+ cset "name='DAC1 L Mux' IF1 DAC"
+ cset "name='DAC1 R Mux' IF1 DAC"
+ cset "name='DAC1 MIXL DAC1 Switch' 1"
+ cset "name='DAC1 MIXR DAC1 Switch' 1"
+ cset "name='Stereo DAC MIXL DAC L1 Switch' 1"
+ cset "name='Stereo DAC MIXR DAC R1 Switch' 1"
+
+ cset "name='DAC L2 Mux' IF2 DAC"
+ cset "name='DAC R2 Mux' IF2 DAC"
cset "name='Mono DAC MIXL DAC L2 Switch' on"
cset "name='Mono DAC MIXR DAC R2 Switch' on"
cset "name='DAC2 Playback Switch' on"
+ cset "name='HPOVOL MIXL DAC1 Switch' on"
+ cset "name='HPOVOL MIXR DAC1 Switch' on"
cset "name='HPOVOL MIXL DAC2 Switch' on"
cset "name='HPOVOL MIXR DAC2 Switch' on"
cset "name='HPO MIX HPVOL Switch' on"
cset "name='HPOVOL L Switch' on"
cset "name='HPOVOL R Switch' on"
+ cset "name='SPK MIXL DAC L1 Switch' on"
+ cset "name='SPK MIXR DAC R1 Switch' on"
cset "name='SPK MIXL DAC L2 Switch' on"
cset "name='SPK MIXR DAC R2 Switch' on"
cset "name='SPOL MIX SPKVOL L Switch' on"
@@ -105,15 +200,18 @@ SectionDevice."Speaker" {
}
ConflictingDevice [
- "Headphone"
+ "Headphones"
]
EnableSequence [
cdev "hw:chtrt5645"
+ cset "name='Headphone Switch' off"
+ cset "name='Headphone Channel Switch' off"
+
cset "name='Ext Spk Switch' on"
cset "name='Speaker Channel Switch' on"
- cset "name='Speaker Playback Volume' 39"
+ cset "name='Speaker Playback Volume' 31"
]
DisableSequence [
@@ -124,7 +222,7 @@ SectionDevice."Speaker" {
]
}
-SectionDevice."Headphone".0 {
+SectionDevice."Headphones" {
Comment "Headphones"
Value {
@@ -140,9 +238,12 @@ SectionDevice."Headphone".0 {
EnableSequence [
cdev "hw:chtrt5645"
+ cset "name='Ext Spk Switch' off"
+ cset "name='Speaker Channel Switch' off"
+
cset "name='Headphone Switch' on"
cset "name='Headphone Channel Switch' on"
- cset "name='Headphone Playback Volume' 39"
+ cset "name='Headphone Playback Volume' 31"
]
DisableSequence [
--
2.16.3
Reference in New Issue View Git Blame Copy Permalink