chtrt5645: corrections and fixes

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/chtrt5645/HiFi-dmic1.conf b/ucm2/chtrt5645/HiFi-dmic1.conf
index 86164c9e0ff4ffab9333ec58e123563a17656320..4748bd9315ca9d24f799e1924194983c53c9c8f1 100644 (file)
--- 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 [
-               <codecs/rt5645/HSMicEnableSeq.conf>
-
-               cset "name='Mono ADC MIXL ADC1 Switch' on"
-               cset "name='Mono ADC MIXR ADC1 Switch' on"
+               <codecs/rt5645/HSMicDisableSeq.conf>
        ]
 }

diff --git a/ucm2/chtrt5645/HiFi-dmic2.conf b/ucm2/chtrt5645/HiFi-dmic2.conf
index 5c947ae43afe5228410a05a2defa5dd14d5f7ec3..459b9f5785664f7dfd0015b899912040662188f8 100644 (file)
--- 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 [
-               <codecs/rt5645/HSMicEnableSeq.conf>
-
-               cset "name='Mono ADC MIXL ADC1 Switch' on"
-               cset "name='Mono ADC MIXR ADC1 Switch' on"
+               <codecs/rt5645/HSMicDisableSeq.conf>
        ]
 }

diff --git a/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf b/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf
index a1bca67ebaf0d24583a02afeacee7abd93e4dd63..fe410f37818dd08a45f29f9e60b6b01ae78bdb30 100644 (file)
--- 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" {
 
 <codecs/rt5645/AnalogMic.conf>
 
-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 [
                <codecs/rt5645/HSMicDisableSeq.conf>
-
-               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 7b2a6635389152f1b116f5962bd5a73f5a1a9c62..954bf68d3032af559d42ad8506aadc4a00338ab7 100644 (file)
--- 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" {
 
 <codecs/rt5645/AnalogMic.conf>
 
-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 [
                <codecs/rt5645/HSMicDisableSeq.conf>
-
-               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 d52fe61e4470a8fff092f550cfe29f1e5b9ceb93..5583cdb8cddb8d7cdf805fae8b7ea493cf4e1c40 100644 (file)
--- 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 [