From: Jaroslav Kysela Date: Tue, 4 Feb 2020 17:44:49 +0000 (+0100) Subject: chtrt5645: corrections and fixes X-Git-Tag: v1.2.2~13 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=4b7f489f6d2fa1e89592fbd1a01f87b725bc7c9c;p=alsa-ucm-conf.git chtrt5645: corrections and fixes Signed-off-by: Jaroslav Kysela --- diff --git a/ucm2/chtrt5645/HiFi-dmic1.conf b/ucm2/chtrt5645/HiFi-dmic1.conf index 86164c9..4748bd9 100644 --- a/ucm2/chtrt5645/HiFi-dmic1.conf +++ b/ucm2/chtrt5645/HiFi-dmic1.conf @@ -2,10 +2,6 @@ SectionVerb { # ALSA PCM Value { TQ "HiFi" - - # ALSA PCM device for HiFi - PlaybackPCM "hw:${CardId}" - CapturePCM "hw:${CardId}" } EnableSequence [ @@ -29,7 +25,9 @@ SectionDevice."Speaker" { Comment "Speaker" Value { - PlaybackChannels "2" + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 } ConflictingDevice [ @@ -50,7 +48,9 @@ SectionDevice."Headphones" { Comment "Headphones" Value { - PlaybackChannels "2" + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 JackControl "Headphone Jack" JackHWMute "Speaker" } @@ -69,12 +69,13 @@ SectionDevice."Headphones" { ] } -SectionDevice."DMic" { +SectionDevice."Mic" { Comment "Internal Microphone" Value { - CaptureChannels "2" - CapturePriority "150" + CapturePriority 100 + CapturePCM "hw:${CardId}" + CaptureChannels 2 } EnableSequence [ @@ -91,13 +92,15 @@ SectionDevice."DMic" { ] } -SectionDevice."HSMic" { +SectionDevice."Headset" { Comment "Headset Microphone" Value { - CaptureChannels "2" + CapturePriority 200 + CapturePCM "hw:${CardId}" + CaptureChannels 2 JackControl "Headset Mic Jack" - JackHWMute "DMic" + JackHWMute "Mic" } EnableSequence [ @@ -113,9 +116,6 @@ SectionDevice."HSMic" { ] DisableSequence [ - - - cset "name='Mono ADC MIXL ADC1 Switch' on" - cset "name='Mono ADC MIXR ADC1 Switch' on" + ] } diff --git a/ucm2/chtrt5645/HiFi-dmic2.conf b/ucm2/chtrt5645/HiFi-dmic2.conf index 5c947ae..459b9f5 100644 --- a/ucm2/chtrt5645/HiFi-dmic2.conf +++ b/ucm2/chtrt5645/HiFi-dmic2.conf @@ -2,10 +2,6 @@ SectionVerb { # ALSA PCM Value { TQ "HiFi" - - # ALSA PCM device for HiFi - PlaybackPCM "hw:${CardId}" - CapturePCM "hw:${CardId}" } EnableSequence [ @@ -29,7 +25,9 @@ SectionDevice."Speaker" { Comment "Speaker" Value { - PlaybackChannels "2" + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 } ConflictingDevice [ @@ -50,7 +48,9 @@ SectionDevice."Headphones" { Comment "Headphones" Value { - PlaybackChannels "2" + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 JackControl "Headphone Jack" JackHWMute "Speaker" } @@ -69,12 +69,13 @@ SectionDevice."Headphones" { ] } -SectionDevice."DMic" { +SectionDevice."Mic" { Comment "Internal Microphone" Value { - CaptureChannels "2" - CapturePriority "150" + CapturePriority 100 + CapturePCM "hw:${CardId}" + CaptureChannels 2 } EnableSequence [ @@ -93,11 +94,13 @@ SectionDevice."DMic" { ] } -SectionDevice."HSMic" { +SectionDevice."Headset" { Comment "Headset Microphone" Value { - CaptureChannels "2" + CapturePriority 200 + CapturePCM "hw:${CardId}" + CaptureChannels 2 JackControl "Headset Mic Jack" JackHWMute "DMic" } @@ -115,9 +118,6 @@ SectionDevice."HSMic" { ] DisableSequence [ - - - cset "name='Mono ADC MIXL ADC1 Switch' on" - cset "name='Mono ADC MIXR ADC1 Switch' on" + ] } diff --git a/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf b/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf index a1bca67..fe410f3 100644 --- a/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf +++ b/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf @@ -2,10 +2,6 @@ SectionVerb { # ALSA PCM Value { TQ "HiFi" - - # ALSA PCM device for HiFi - PlaybackPCM "hw:${CardId}" - CapturePCM "hw:${CardId}" } EnableSequence [ @@ -29,7 +25,9 @@ SectionDevice."Speaker" { Comment "Speaker" Value { - PlaybackChannels "2" + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 } ConflictingDevice [ @@ -54,7 +52,9 @@ SectionDevice."Headphones" { Comment "Headphones" Value { - PlaybackChannels "2" + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 JackControl "Headphone Jack" JackHWMute "Speaker" } @@ -79,11 +79,13 @@ SectionDevice."Headphones" { -SectionDevice."HSMic" { +SectionDevice."Headset" { Comment "Headset Microphone" Value { - CaptureChannels "2" + CapturePriority 200 + CapturePCM "hw:${CardId}" + CaptureChannels 2 JackControl "Headset Mic Jack" JackHWMute "Mic" } @@ -102,8 +104,5 @@ SectionDevice."HSMic" { DisableSequence [ - - cset "name='Mono ADC MIXL ADC1 Switch' on" - cset "name='Mono ADC MIXR ADC1 Switch' on" ] } diff --git a/ucm2/chtrt5645/HiFi.conf b/ucm2/chtrt5645/HiFi.conf index 7b2a663..954bf68 100644 --- a/ucm2/chtrt5645/HiFi.conf +++ b/ucm2/chtrt5645/HiFi.conf @@ -2,10 +2,6 @@ SectionVerb { # ALSA PCM Value { TQ "HiFi" - - # ALSA PCM device for HiFi - PlaybackPCM "hw:${CardId}" - CapturePCM "hw:${CardId}" } EnableSequence [ @@ -29,7 +25,9 @@ SectionDevice."Speaker" { Comment "Speaker" Value { - PlaybackChannels "2" + PlaybackPriority 100 + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 } ConflictingDevice [ @@ -50,7 +48,9 @@ SectionDevice."Headphones" { Comment "Headphones" Value { - PlaybackChannels "2" + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + PlaybackChannels 2 JackControl "Headphone Jack" JackHWMute "Speaker" } @@ -71,11 +71,13 @@ SectionDevice."Headphones" { -SectionDevice."HSMic" { +SectionDevice."Headset" { Comment "Headset Microphone" Value { - CaptureChannels "2" + CapturePriority 200 + CapturePCM "hw:${CardId}" + CaptureChannels 2 JackControl "Headset Mic Jack" JackHWMute "Mic" } @@ -94,8 +96,5 @@ SectionDevice."HSMic" { DisableSequence [ - - cset "name='Mono ADC MIXL ADC1 Switch' on" - cset "name='Mono ADC MIXR ADC1 Switch' on" ] } diff --git a/ucm2/codecs/rt5645/AnalogMic.conf b/ucm2/codecs/rt5645/AnalogMic.conf index d52fe61..5583cdb 100644 --- a/ucm2/codecs/rt5645/AnalogMic.conf +++ b/ucm2/codecs/rt5645/AnalogMic.conf @@ -2,8 +2,9 @@ SectionDevice."Mic" { Comment "Internal Analog Microphone" Value { - CaptureChannels "2" - CapturePriority "150" + CapturePriority 100 + CapturePCM "hw:${CardId}" + CaptureChannels 2 } EnableSequence [