cht-bsw-rt5672: fixes and corrections

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

diff --git a/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf b/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf
index 2916490bbdb588c23907e4e88a85416e4c35c428..82c976bcdd25dcaa04813c4f19e7e8d4c9728790 100644 (file)
--- a/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf
+++ b/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf
@@ -9,15 +9,14 @@ SectionVerb {
        DisableSequence [
                <platforms/bytcr/PlatformDisableSeq.conf>
        ]
-
-       Value {
-               PlaybackPCM "hw:${CardId}"
-               CapturePCM "hw:${CardId}"
-       }
 }
 
 <codecs/rt5672/Speaker.conf>
+RenameDevice."Speaker1" "Speaker"
+RemoveDevice."Speaker2" "Speaker2"
 <codecs/rt5672/HeadPhones.conf>
 
 <codecs/rt5672/DMIC2.conf>
+RenameDevice."Mic2" "Mic"
+RemoveDevice."Mic1" "Mic1"
 <codecs/rt5672/HeadsetMic.conf>

diff --git a/ucm2/cht-bsw-rt5672/HiFi.conf b/ucm2/cht-bsw-rt5672/HiFi.conf
index 18c693283083ba5fd753de225867cbf39946228f..9a64cc30d2ca691f9856df39b1f2391193384e75 100644 (file)
--- a/ucm2/cht-bsw-rt5672/HiFi.conf
+++ b/ucm2/cht-bsw-rt5672/HiFi.conf
@@ -9,11 +9,6 @@ SectionVerb {
        DisableSequence [
                <platforms/bytcr/PlatformDisableSeq.conf>
        ]
-
-       Value {
-               PlaybackPCM "hw:${CardId}"
-               CapturePCM "hw:${CardId}"
-       }
 }
 
 <codecs/rt5672/Speaker.conf>

diff --git a/ucm2/codecs/rt5672/DMIC1.conf b/ucm2/codecs/rt5672/DMIC1.conf
index b3da62780dd38637363baafdccb44521c3358942..73983af48a37a0ee72b3b3f16f7f92dfaaf163af 100644 (file)
--- a/ucm2/codecs/rt5672/DMIC1.conf
+++ b/ucm2/codecs/rt5672/DMIC1.conf
@@ -1,9 +1,9 @@
-SectionDevice."DigitalMic-DMIC1" {
+SectionDevice."Mic1" {
        Comment "Internal Digital Microphone on DMIC1"
 
        ConflictingDevice [
-               "DigitalMic-DMIC2"
-               "HeadsetMic"
+               "Mic2"
+               "Headset"
        ]
 
        EnableSequence [
@@ -21,6 +21,8 @@ SectionDevice."DigitalMic-DMIC1" {
        ]
 
        Value {
+               CapturePriority 100
+               CapturePCM "hw:${CardId}"
                CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5672/DMIC2.conf b/ucm2/codecs/rt5672/DMIC2.conf
index 38fe015a9629bef16da433bdac0e2a423d72eb4e..751c95cf22f11a9a19db800b16b883c8175b7243 100644 (file)
--- a/ucm2/codecs/rt5672/DMIC2.conf
+++ b/ucm2/codecs/rt5672/DMIC2.conf
@@ -1,9 +1,9 @@
-SectionDevice."DigitalMic-DMIC2" {
+SectionDevice."Mic2" {
        Comment "Internal Digital Microphone on DMIC2"
 
        ConflictingDevice [
-               "DigitalMic-DMIC1"
-               "HeadsetMic"
+               "Mic1"
+               "Headset"
        ]
 
        EnableSequence [
@@ -21,6 +21,8 @@ SectionDevice."DigitalMic-DMIC2" {
        ]
 
        Value {
+               CapturePriority 200
+               CapturePCM "hw:${CardId}"
                CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5672/HeadPhones.conf b/ucm2/codecs/rt5672/HeadPhones.conf
index 350fb2b4ed73f67f3668a85693e0fc9622e0130f..0542f7790052101e8d62a5b3d2f6a5885685e012 100644 (file)
--- a/ucm2/codecs/rt5672/HeadPhones.conf
+++ b/ucm2/codecs/rt5672/HeadPhones.conf
@@ -2,8 +2,8 @@ SectionDevice."Headphones" {
        Comment "Headphones"
 
        ConflictingDevice [
-               "Speaker"
-               "MonoSpeaker"
+               "Speaker1"
+               "Speaker2"
        ]
 
        EnableSequence [
@@ -15,7 +15,9 @@ SectionDevice."Headphones" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 300
+               PlaybackPCM "hw:${CardId}"
+               PlaybackChannels 2
                JackControl "Headphone Jack"
        }
 }

diff --git a/ucm2/codecs/rt5672/HeadsetMic.conf b/ucm2/codecs/rt5672/HeadsetMic.conf
index fd02cb3a676aa9ba8de182bc919232d5dfd3fa17..f407579b302d9793e64807a1f53ce79f0a969bbc 100644 (file)
--- a/ucm2/codecs/rt5672/HeadsetMic.conf
+++ b/ucm2/codecs/rt5672/HeadsetMic.conf
@@ -1,9 +1,9 @@
-SectionDevice."HeadsetMic" {
+SectionDevice."Headset" {
        Comment "Headset Microphone"
 
        ConflictingDevice [
-               "DigitalMic-DMIC1"
-               "DigitalMic-DMIC2"
+               "Mic1"
+               "Mic2"
        ]
 
        EnableSequence [
@@ -30,7 +30,9 @@ SectionDevice."HeadsetMic" {
        ]
 
        Value {
-               CaptureChannels "2"
+               CapturePriority 300
+               CapturePCM "hw:${CardId}"
+               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/rt5672/MonoSpeaker.conf b/ucm2/codecs/rt5672/MonoSpeaker.conf
index 6308ad953c7fbf23e098f4f372fbcd1278df7d18..0849c6744beab0f3dab4e7ef0fe5df0c33dfb723 100644 (file)
--- a/ucm2/codecs/rt5672/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5672/MonoSpeaker.conf
@@ -1,8 +1,8 @@
-SectionDevice."MonoSpeaker" {
+SectionDevice."Speaker2" {
        Comment "Mono Speaker"
 
        ConflictingDevice [
-               "Speaker"
+               "Speaker1"
                "Headphones"
        ]
 
@@ -19,6 +19,8 @@ SectionDevice."MonoSpeaker" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId}"
+               PlaybackChannels 2
        }
 }

diff --git a/ucm2/codecs/rt5672/Speaker.conf b/ucm2/codecs/rt5672/Speaker.conf
index e4391ccca589bf62f8d39acc7f8ec728a606a332..44e73aa875c32635a07c8ee1d1ae054c9e331a66 100644 (file)
--- a/ucm2/codecs/rt5672/Speaker.conf
+++ b/ucm2/codecs/rt5672/Speaker.conf
@@ -1,8 +1,8 @@
-SectionDevice."Speaker" {
-       Comment "Speakers"
+SectionDevice."Speaker1" {
+       Comment "Stereo Speakers"
 
        ConflictingDevice [
-               "MonoSpeaker"
+               "Speaker2"
                "Headphones"
        ]
 
@@ -15,6 +15,8 @@ SectionDevice."Speaker" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 200
+               PlaybackPCM "hw:${CardId}"
+               PlaybackChannels 2
        }
 }