diff mbox series

[5/5] cht-bsw-rt5672: Fix HiFi-stereo-dmic2 conf not loading / working

Message ID 20200405183454.34515-5-hdegoede@redhat.com
State New
Headers show
Series None | expand

Commit Message

Hans de Goede April 5, 2020, 6:34 p.m. UTC 
Fix HiFi-stereo-dmic2 conf not loading because of references to
non existing devices in the ConflictingDevices sections.

Stop playing Rename + Remove tricks with the output (Speaker2) and
input (DMIC1) devices which we do not want to be part of this config,
this does not work now that we only allow devices which are actually
part of our config in the ConflictingDevices sections.

Instead start with only having devices which all configs have in
the ConflictingDevices sections (Headphones / Headset) and add the
other ones from our HiFi*.conf files after including the shared
basic configs.

BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1786723
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
I have tested that both HiFi.conf and HiFi-stereo-dmic2.conf work
properly after these changes.
---
 ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf | 6 ++----
 ucm2/cht-bsw-rt5672/HiFi.conf              | 8 ++++++++
 ucm2/codecs/rt5672/DMIC1.conf              | 1 -
 ucm2/codecs/rt5672/DMIC2.conf              | 1 -
 ucm2/codecs/rt5672/HeadPhones.conf         | 2 --
 ucm2/codecs/rt5672/HeadsetMic.conf         | 2 --
 ucm2/codecs/rt5672/MonoSpeaker.conf        | 1 -
 ucm2/codecs/rt5672/Speaker.conf            | 1 -
 8 files changed, 10 insertions(+), 12 deletions(-)
diff mbox series

Patch

diff --git a/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf b/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf
index 82c976b..5e06b42 100644
--- a/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf
+++ b/ucm2/cht-bsw-rt5672/HiFi-stereo-dmic2.conf
@@ -12,11 +12,9 @@  SectionVerb {
 }
 
 <codecs/rt5672/Speaker.conf>
-RenameDevice."Speaker1" "Speaker"
-RemoveDevice."Speaker2" "Speaker2"
 <codecs/rt5672/HeadPhones.conf>
+SectionDevice."Headphones".ConflictingDevice.0 "Speaker1"
 
 <codecs/rt5672/DMIC2.conf>
-RenameDevice."Mic2" "Mic"
-RemoveDevice."Mic1" "Mic1"
 <codecs/rt5672/HeadsetMic.conf>
+SectionDevice."Headset".ConflictingDevice.0 "Mic2"
diff --git a/ucm2/cht-bsw-rt5672/HiFi.conf b/ucm2/cht-bsw-rt5672/HiFi.conf
index 9a64cc3..2dfa479 100644
--- a/ucm2/cht-bsw-rt5672/HiFi.conf
+++ b/ucm2/cht-bsw-rt5672/HiFi.conf
@@ -14,7 +14,15 @@  SectionVerb {
 <codecs/rt5672/Speaker.conf>
 <codecs/rt5672/MonoSpeaker.conf>
 <codecs/rt5672/HeadPhones.conf>
+SectionDevice."Speaker1".ConflictingDevice.1 "Speaker2"
+SectionDevice."Speaker2".ConflictingDevice.1 "Speaker1"
+SectionDevice."Headphones".ConflictingDevice.0 "Speaker1"
+SectionDevice."Headphones".ConflictingDevice.1 "Speaker2"
 
 <codecs/rt5672/DMIC1.conf>
 <codecs/rt5672/DMIC2.conf>
 <codecs/rt5672/HeadsetMic.conf>
+SectionDevice."Mic1".ConflictingDevice.1 "Mic2"
+SectionDevice."Mic2".ConflictingDevice.1 "Mic1"
+SectionDevice."Headset".ConflictingDevice.0 "Mic1"
+SectionDevice."Headset".ConflictingDevice.1 "Mic2"
diff --git a/ucm2/codecs/rt5672/DMIC1.conf b/ucm2/codecs/rt5672/DMIC1.conf
index 2018283..acc26f7 100644
--- a/ucm2/codecs/rt5672/DMIC1.conf
+++ b/ucm2/codecs/rt5672/DMIC1.conf
@@ -2,7 +2,6 @@  SectionDevice."Mic1" {
 	Comment "Internal Digital Microphone on DMIC1"
 
 	ConflictingDevice [
-		"Mic2"
 		"Headset"
 	]
 
diff --git a/ucm2/codecs/rt5672/DMIC2.conf b/ucm2/codecs/rt5672/DMIC2.conf
index 48e6170..abe139b 100644
--- a/ucm2/codecs/rt5672/DMIC2.conf
+++ b/ucm2/codecs/rt5672/DMIC2.conf
@@ -2,7 +2,6 @@  SectionDevice."Mic2" {
 	Comment "Internal Digital Microphone on DMIC2"
 
 	ConflictingDevice [
-		"Mic1"
 		"Headset"
 	]
 
diff --git a/ucm2/codecs/rt5672/HeadPhones.conf b/ucm2/codecs/rt5672/HeadPhones.conf
index 2c8d6e8..9178607 100644
--- a/ucm2/codecs/rt5672/HeadPhones.conf
+++ b/ucm2/codecs/rt5672/HeadPhones.conf
@@ -2,8 +2,6 @@  SectionDevice."Headphones" {
 	Comment "Headphones"
 
 	ConflictingDevice [
-		"Speaker1"
-		"Speaker2"
 	]
 
 	EnableSequence [
diff --git a/ucm2/codecs/rt5672/HeadsetMic.conf b/ucm2/codecs/rt5672/HeadsetMic.conf
index a764d82..e04c3ce 100644
--- a/ucm2/codecs/rt5672/HeadsetMic.conf
+++ b/ucm2/codecs/rt5672/HeadsetMic.conf
@@ -2,8 +2,6 @@  SectionDevice."Headset" {
 	Comment "Headset Microphone"
 
 	ConflictingDevice [
-		"Mic1"
-		"Mic2"
 	]
 
 	EnableSequence [
diff --git a/ucm2/codecs/rt5672/MonoSpeaker.conf b/ucm2/codecs/rt5672/MonoSpeaker.conf
index f08c9c6..88c39d2 100644
--- a/ucm2/codecs/rt5672/MonoSpeaker.conf
+++ b/ucm2/codecs/rt5672/MonoSpeaker.conf
@@ -2,7 +2,6 @@  SectionDevice."Speaker2" {
 	Comment "Mono Speaker"
 
 	ConflictingDevice [
-		"Speaker1"
 		"Headphones"
 	]
 
diff --git a/ucm2/codecs/rt5672/Speaker.conf b/ucm2/codecs/rt5672/Speaker.conf
index 8b7bcf8..c70ffae 100644
--- a/ucm2/codecs/rt5672/Speaker.conf
+++ b/ucm2/codecs/rt5672/Speaker.conf
@@ -2,7 +2,6 @@  SectionDevice."Speaker1" {
 	Comment "Stereo Speakers"
 
 	ConflictingDevice [
-		"Speaker2"
 		"Headphones"
 	]