104 lines
3.0 KiB
Diff
104 lines
3.0 KiB
Diff
|
From d0b1a426ba7cbfb34355a4101bb314ba288a6679 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
Date: Sun, 5 Apr 2020 20:34:53 +0200
|
||
|
|
Subject: [PATCH 09/10] chtrt5645: Remove bogus JackHWMute settings
|
||
|
|
|
||
|
|
There is no reason why the internal microphone or speakers cannot
|
||
|
|
be used when a headset is plugged in.
|
||
|
|
|
||
|
|
The jack does not physically disconnect these, so the JackHWMute settings
|
||
|
|
are wrong, remove them.
|
||
|
|
|
||
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||
|
|
---
|
||
|
|
ucm2/chtrt5645/HiFi-dmic1.conf | 2 --
|
||
|
|
ucm2/chtrt5645/HiFi-dmic2.conf | 2 --
|
||
|
|
ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf | 2 --
|
||
|
|
ucm2/chtrt5645/HiFi.conf | 2 --
|
||
|
|
4 files changed, 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ucm2/chtrt5645/HiFi-dmic1.conf b/ucm2/chtrt5645/HiFi-dmic1.conf
|
||
|
|
index 1a8ee0abdadf..c7e12c9e2625 100644
|
||
|
|
--- a/ucm2/chtrt5645/HiFi-dmic1.conf
|
||
|
|
+++ b/ucm2/chtrt5645/HiFi-dmic1.conf
|
||
|
|
@@ -50,7 +50,6 @@ SectionDevice."Headphones" {
|
||
|
|
PlaybackPriority 200
|
||
|
|
PlaybackPCM "hw:${CardId}"
|
||
|
|
JackControl "Headphone Jack"
|
||
|
|
- JackHWMute "Speaker"
|
||
|
|
}
|
||
|
|
|
||
|
|
ConflictingDevice [
|
||
|
|
@@ -96,7 +95,6 @@ SectionDevice."Headset" {
|
||
|
|
CapturePriority 200
|
||
|
|
CapturePCM "hw:${CardId}"
|
||
|
|
JackControl "Headset Mic Jack"
|
||
|
|
- JackHWMute "Mic"
|
||
|
|
}
|
||
|
|
|
||
|
|
EnableSequence [
|
||
|
|
diff --git a/ucm2/chtrt5645/HiFi-dmic2.conf b/ucm2/chtrt5645/HiFi-dmic2.conf
|
||
|
|
index d3f880aa6bc0..95fedb3eb03e 100644
|
||
|
|
--- a/ucm2/chtrt5645/HiFi-dmic2.conf
|
||
|
|
+++ b/ucm2/chtrt5645/HiFi-dmic2.conf
|
||
|
|
@@ -50,7 +50,6 @@ SectionDevice."Headphones" {
|
||
|
|
PlaybackPriority 200
|
||
|
|
PlaybackPCM "hw:${CardId}"
|
||
|
|
JackControl "Headphone Jack"
|
||
|
|
- JackHWMute "Speaker"
|
||
|
|
}
|
||
|
|
|
||
|
|
ConflictingDevice [
|
||
|
|
@@ -98,7 +97,6 @@ SectionDevice."Headset" {
|
||
|
|
CapturePriority 200
|
||
|
|
CapturePCM "hw:${CardId}"
|
||
|
|
JackControl "Headset Mic Jack"
|
||
|
|
- JackHWMute "Mic"
|
||
|
|
}
|
||
|
|
|
||
|
|
EnableSequence [
|
||
|
|
diff --git a/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf b/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf
|
||
|
|
index db866cd5c67a..f6180a4932eb 100644
|
||
|
|
--- a/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf
|
||
|
|
+++ b/ucm2/chtrt5645/HiFi-mono-speaker-analog-mic.conf
|
||
|
|
@@ -54,7 +54,6 @@ SectionDevice."Headphones" {
|
||
|
|
PlaybackPriority 200
|
||
|
|
PlaybackPCM "hw:${CardId}"
|
||
|
|
JackControl "Headphone Jack"
|
||
|
|
- JackHWMute "Speaker"
|
||
|
|
}
|
||
|
|
|
||
|
|
ConflictingDevice [
|
||
|
|
@@ -84,7 +83,6 @@ SectionDevice."Headset" {
|
||
|
|
CapturePriority 200
|
||
|
|
CapturePCM "hw:${CardId}"
|
||
|
|
JackControl "Headset Mic Jack"
|
||
|
|
- JackHWMute "Mic"
|
||
|
|
}
|
||
|
|
|
||
|
|
EnableSequence [
|
||
|
|
diff --git a/ucm2/chtrt5645/HiFi.conf b/ucm2/chtrt5645/HiFi.conf
|
||
|
|
index 58468a8ddd02..116d456e349e 100644
|
||
|
|
--- a/ucm2/chtrt5645/HiFi.conf
|
||
|
|
+++ b/ucm2/chtrt5645/HiFi.conf
|
||
|
|
@@ -50,7 +50,6 @@ SectionDevice."Headphones" {
|
||
|
|
PlaybackPriority 200
|
||
|
|
PlaybackPCM "hw:${CardId}"
|
||
|
|
JackControl "Headphone Jack"
|
||
|
|
- JackHWMute "Speaker"
|
||
|
|
}
|
||
|
|
|
||
|
|
ConflictingDevice [
|
||
|
|
@@ -76,7 +75,6 @@ SectionDevice."Headset" {
|
||
|
|
CapturePriority 200
|
||
|
|
CapturePCM "hw:${CardId}"
|
||
|
|
JackControl "Headset Mic Jack"
|
||
|
|
- JackHWMute "Mic"
|
||
|
|
}
|
||
|
|
|
||
|
|
EnableSequence [
|
||
|
|
--
|
||
|
|
2.16.4
|
||
|
|
|