pool/alsa-ucm-conf
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 809162 from home:tiwai:branches:multimedia:libs

Browse Source 
- More catch up of upstream fixes: mostly cosmetic style fixes:
  0011-ucm2-remove-empty-enable-disable-sequence-sections.patch
  0012-ucm2-fix-indentation-use-tabs.patch
  0013-Add-initial-support-for-Realtek-ALC1220-TRX40-mother.patch
  0014-ucm2-fix-chtrt5650-configuration-ucm-validator.patch
  0015-bytcr-rt5651-fix-the-cfg-mic-in1-cfg-mic-in12-match-.patch
  0016-ucm-fix-wrong-If-in-sequence-in-HiFi-dual.conf.patch
- Add UCM profile for Chromebook Asus C300 (bsc#1171492):
  0100-ucm2-Add-profile-for-Chromebook-Asus-C300.patch

OBS-URL: https://build.opensuse.org/request/show/809162
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-ucm-conf?expand=0&rev=13
This commit is contained in:
Takashi Iwai 2020-05-27 06:46:59 +00:00 committed by Git OBS Bridge
parent f3bd61e636
commit 823fc1a5be
9 changed files with 739 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
0011-ucm2-remove-empty-enable-disable-sequence-sections.patch Normal file
View File

@ -0,0 +1,93 @@
From d6a150d34f6e3a327215ad3452cfcfe164671717 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 21 Apr 2020 16:54:53 +0200
Subject: [PATCH] ucm2: remove empty enable/disable sequence sections
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/codecs/rt5651/HeadPhones.conf | 4 ++--
ucm2/codecs/rt5651/Speaker.conf | 4 ++--
ucm2/sof-bdw-rt5677/HiFi.conf | 15 ---------------
3 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/ucm2/codecs/rt5651/HeadPhones.conf b/ucm2/codecs/rt5651/HeadPhones.conf
index 266c8519629c..c7165878e494 100644
--- a/ucm2/codecs/rt5651/HeadPhones.conf
+++ b/ucm2/codecs/rt5651/HeadPhones.conf
@@ -15,12 +15,12 @@ SectionDevice."Headphones" {
cset "name='LOUT R Playback Switch' off"
]
- DisableSequence [
+ # DisableSequence [
# This is done by the Speaker EnableSequence, so that the
# Platform Clock and BIAS do not temporarily get turned off
# as that breaks audio-streams which are playing when
# switching between Speaker/Headphone
- ]
+ # ]
Value {
PlaybackPriority 200
diff --git a/ucm2/codecs/rt5651/Speaker.conf b/ucm2/codecs/rt5651/Speaker.conf
index 18308b48f980..b63390fb3d20 100644
--- a/ucm2/codecs/rt5651/Speaker.conf
+++ b/ucm2/codecs/rt5651/Speaker.conf
@@ -15,12 +15,12 @@ SectionDevice."Speaker" {
cset "name='HPO R Playback Switch' off"
]
- DisableSequence [
+ # DisableSequence [
# This is done by the Headphones EnableSequence, so that the
# Platform Clock and BIAS do not temporarily get turned off
# as that breaks audio-streams which are playing when
# switching between Speaker/Headphone
- ]
+ # ]
Value {
PlaybackPriority 100
diff --git a/ucm2/sof-bdw-rt5677/HiFi.conf b/ucm2/sof-bdw-rt5677/HiFi.conf
index 724a1cc3fbdf..30dc987cc607 100644
--- a/ucm2/sof-bdw-rt5677/HiFi.conf
+++ b/ucm2/sof-bdw-rt5677/HiFi.conf
@@ -74,9 +74,6 @@ SectionVerb {
cset "name='IB01 Bypass Mux' Bypass"
cset "name='Mono ADC Boost Volume' 2"
]
-
- DisableSequence [
- ]
}
SectionDevice."Speaker" {
@@ -86,12 +83,6 @@ SectionDevice."Speaker" {
"Headphones"
]
- EnableSequence [
- ]
-
- DisableSequence [
- ]
-
Value {
PlaybackPriority 100
PlaybackPCM "hw:${CardId}"
@@ -143,12 +134,6 @@ SectionDevice."Mic" {
"Headset"
]
- EnableSequence [
- ]
-
- DisableSequence [
- ]
-
Value {
CapturePriority 100
CapturePCM "hw:${CardId}"
--
2.16.4

92
0012-ucm2-fix-indentation-use-tabs.patch Normal file
View File

@ -0,0 +1,92 @@
From 1550dd3dc4b5bc5c9685ba0c8657d684e52bbc2e Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 22 Apr 2020 12:11:48 +0200
Subject: [PATCH] ucm2: fix indentation (use tabs)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/PAZ00/PAZ00.conf | 42 +++++++++++++++++++++---------------------
ucm2/kblrt5660/kblrt5660.conf | 8 ++++----
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/ucm2/PAZ00/PAZ00.conf b/ucm2/PAZ00/PAZ00.conf
index 2112225943e5..aa1e7f7386a8 100644
--- a/ucm2/PAZ00/PAZ00.conf
+++ b/ucm2/PAZ00/PAZ00.conf
@@ -3,32 +3,32 @@ Syntax 2
Comment "PAZ00 alc5632"
SectionDefaults [
- cset "name='Master Playback Switch' on"
- cset "name='Master Playback Volume' 44,44"
- cset "name='Headphone Playback Volume' 21,21"
- cset "name='Speaker Playback Volume' 21,21"
- cset "name='SpeakerOut Mux' 2"
- cset "name='SpeakerOut N Mux' LN/-R"
- cset "name='AB-D Amp Mux' 0"
- cset "name='Left Headphone Mux' 1"
- cset "name='Right Headphone Mux' 1"
- cset "name='DMIC Boost Capture Volume' 4"
- cset "name='Rec Capture Volume' 24"
+ cset "name='Master Playback Switch' on"
+ cset "name='Master Playback Volume' 44,44"
+ cset "name='Headphone Playback Volume' 21,21"
+ cset "name='Speaker Playback Volume' 21,21"
+ cset "name='SpeakerOut Mux' 2"
+ cset "name='SpeakerOut N Mux' LN/-R"
+ cset "name='AB-D Amp Mux' 0"
+ cset "name='Left Headphone Mux' 1"
+ cset "name='Right Headphone Mux' 1"
+ cset "name='DMIC Boost Capture Volume' 4"
+ cset "name='Rec Capture Volume' 24"
- # Fix external mic record volumes
- cset "name='Mic 1 Boost Volume' 0"
- cset "name='Mic 2 Boost Volume' 0"
- cset "name='Mic1 Playback Volume' 0"
- cset "name='Mic2 Playback Volume' 0"
- cset "name='Rec Capture Volume' 0"
+ # Fix external mic record volumes
+ cset "name='Mic 1 Boost Volume' 0"
+ cset "name='Mic 2 Boost Volume' 0"
+ cset "name='Mic1 Playback Volume' 0"
+ cset "name='Mic2 Playback Volume' 0"
+ cset "name='Rec Capture Volume' 0"
]
SectionUseCase."HiFi" {
- File "HiFi.conf"
- Comment "Music playback"
+ File "HiFi.conf"
+ Comment "Music playback"
}
SectionUseCase."Record" {
- File "Record.conf"
- Comment "Playback and capture"
+ File "Record.conf"
+ Comment "Playback and capture"
}
diff --git a/ucm2/kblrt5660/kblrt5660.conf b/ucm2/kblrt5660/kblrt5660.conf
index 124fb8833364..1cdf91728efe 100755
--- a/ucm2/kblrt5660/kblrt5660.conf
+++ b/ucm2/kblrt5660/kblrt5660.conf
@@ -6,11 +6,11 @@ SectionUseCase."HiFi" {
}
SectionUseCase."Hdmi1" {
- File "Hdmi1.conf"
- Comment "Play on Hdmi/DP 1"
+ File "Hdmi1.conf"
+ Comment "Play on Hdmi/DP 1"
}
SectionUseCase."Hdmi2" {
- File "Hdmi2.conf"
- Comment "Play on Hdmi/DP 2"
+ File "Hdmi2.conf"
+ Comment "Play on Hdmi/DP 2"
}
--
2.16.4

116
0013-Add-initial-support-for-Realtek-ALC1220-TRX40-mother.patch Normal file
View File

@ -0,0 +1,116 @@
From 48b11a4c33f267c8ffd9a6c584c3e651eda7e5ec Mon Sep 17 00:00:00 2001
From: Maxim Levitsky <mlevitsk@redhat.com>
Date: Sun, 3 May 2020 22:31:12 +0300
Subject: [PATCH] Add initial support for Realtek ALC1220 TRX40 motherboards
Tested with TRX40 Designare but should work on most TRX40 motherboards
Tested with pulseaudio 36a4923f9bd05d4c5e2e8b1765f18edf452b9251
with fix for 8 channel mixer element applied
Tested with kernel 5.7.0-rc3
The following are the notes of the testing and implementation
* Back speaker works in 5.1 mode, becasue side channel
shares jack with line-in and by default line-in is configured.
Once jack retasking will work, it will work automatically
Same for front mic that can be retasked to line-in
* SPDIF is not tested physically yet. The SPDIF mute mixer control is recognised by
pulseaudio correctly so profile is correct.
* When all capture inputs are disconnected, pulseaudio thinks that the UCM2 profile
is invalid and doesn't use it by default. It can be forced to use it by selecting
it in the pavucontrol. Or you can for now comment out one of 'JackControl' statements,
to make it think that one of the jacks is always plugged in.
Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
.../USB-Audio/Realtek-ALC1220-VB-Desktop-HiFi.conf | 60 ++++++++++++++++++++++
ucm2/USB-Audio/Realtek-ALC1220-VB-Desktop.conf | 6 +++
2 files changed, 66 insertions(+)
create mode 100644 ucm2/USB-Audio/Realtek-ALC1220-VB-Desktop-HiFi.conf
create mode 100644 ucm2/USB-Audio/Realtek-ALC1220-VB-Desktop.conf
diff --git a/ucm2/USB-Audio/Realtek-ALC1220-VB-Desktop-HiFi.conf b/ucm2/USB-Audio/Realtek-ALC1220-VB-Desktop-HiFi.conf
new file mode 100644
index 000000000000..344db8335398
--- /dev/null
+++ b/ucm2/USB-Audio/Realtek-ALC1220-VB-Desktop-HiFi.conf
@@ -0,0 +1,60 @@
+SectionDevice."Speaker" {
+ Comment "Speakers"
+ Value {
+ PlaybackChannels 8
+ PlaybackPriority 100
+ PlaybackPCM "hw:${CardId}"
+ JackControl "Speaker Jack"
+ PlaybackMixerElem "Speaker"
+ }
+}
+
+SectionDevice."Headphones" {
+ Comment "Front Headphones"
+ Value {
+ PlaybackPriority 300
+ PlaybackPCM "hw:${CardId},1"
+ JackControl "Front Headphone Jack"
+ PlaybackMixerElem "Front Headphone"
+ }
+}
+
+SectionDevice."SPDIF" {
+ Comment "S/PDIF Out"
+ Value {
+ PlaybackPriority 200
+ PlaybackPCM "hw:${CardId},2"
+ PlaybackMixerElem "IEC958"
+ }
+}
+
+SectionDevice."Line" {
+ Comment "Line In"
+ Value {
+ CapturePriority 100
+ CapturePCM "hw:${CardId}"
+ JackControl "Line Jack"
+ CaptureMixerElem "Line"
+ }
+}
+
+SectionDevice."Mic1" {
+ Comment "Microphone"
+ Value {
+ CapturePriority 200
+ CapturePCM "hw:${CardId},1"
+ JackControl "Mic Jack"
+ CaptureMixerElem "Mic"
+ }
+}
+
+SectionDevice."Mic2" {
+ Comment "Front Microphone"
+ Value {
+ CapturePriority 300
+ CapturePCM "hw:${CardId},2"
+ JackControl "Front Mic Jack"
+ CaptureMixerElem "Front Mic"
+ }
+}
+
diff --git a/ucm2/USB-Audio/Realtek-ALC1220-VB-Desktop.conf b/ucm2/USB-Audio/Realtek-ALC1220-VB-Desktop.conf
new file mode 100644
index 000000000000..da257e7ed336
--- /dev/null
+++ b/ucm2/USB-Audio/Realtek-ALC1220-VB-Desktop.conf
@@ -0,0 +1,6 @@
+Syntax 2
+Comment "USB-audio on Realtek ALC1220-VB desktop"
+SectionUseCase."HiFi" {
+ File "Realtek-ALC1220-VB-Desktop-HiFi.conf"
+ Comment "Default Alsa Profile"
+}
--
2.16.4

82
0014-ucm2-fix-chtrt5650-configuration-ucm-validator.patch Normal file
View File

@ -0,0 +1,82 @@
From 0c025ab9ddb2099b3ee18d5d11cdd3fd318b5609 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 23 May 2020 22:28:05 +0200
Subject: [PATCH] ucm2: fix chtrt5650 configuration (ucm-validator)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/chtrt5650/HiFi.conf | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/ucm2/chtrt5650/HiFi.conf b/ucm2/chtrt5650/HiFi.conf
index e9011d4b1bd5..b365bc619e7c 100644
--- a/ucm2/chtrt5650/HiFi.conf
+++ b/ucm2/chtrt5650/HiFi.conf
@@ -3,10 +3,6 @@ SectionVerb {
# ALSA PCM
Value {
TQ "HiFi"
-
- # ALSA PCM device for HiFi
- PlaybackPCM "hw:${CardId}"
- CapturePCM "hw:${CardId}"
}
EnableSequence [
@@ -29,7 +25,8 @@ SectionDevice."Speaker" {
Comment "Speaker"
Value {
- PlaybackChannels "2"
+ PlaybackPCM "hw:${CardId}"
+ PlaybackPriority 100
}
ConflictingDevice [
@@ -50,7 +47,8 @@ SectionDevice."Headphones" {
Comment "Headphones"
Value {
- PlaybackChannels "2"
+ PlaybackPCM "hw:${CardId}"
+ PlaybackPriority 200
JackControl "Headphone Jack"
JackHWMute "Speaker"
}
@@ -69,12 +67,12 @@ SectionDevice."Headphones" {
]
}
-SectionDevice."Mic" {
+SectionDevice."Mic1" {
Comment "Internal Microphone"
Value {
- CaptureChannels "2"
- CapturePriority "150"
+ CapturePCM "hw:${CardId}"
+ CapturePriority 100
}
EnableSequence [
@@ -90,13 +88,14 @@ SectionDevice."Mic" {
]
}
-SectionDevice."HSMic" {
+SectionDevice."Mic2" {
Comment "Headset Microphone"
Value {
- CaptureChannels "2"
+ CapturePCM "hw:${CardId}"
+ CapturePriority 200
JackControl "Headset Mic Jack"
- JackHWMute "Mic"
+ JackHWMute "Mic1"
}
EnableSequence [
--
2.16.4

52
0015-bytcr-rt5651-fix-the-cfg-mic-in1-cfg-mic-in12-match-.patch Normal file
View File

@ -0,0 +1,52 @@
From 1b502a0b5b0f4068afa2afd1f81372fe9f323eb5 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 25 May 2020 17:03:03 +0200
Subject: [PATCH] bytcr-rt5651: fix the cfg-mic:in1 / cfg-mic:in12 match error
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/bytcr-rt5651/HiFi-Components.conf | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/ucm2/bytcr-rt5651/HiFi-Components.conf b/ucm2/bytcr-rt5651/HiFi-Components.conf
index d0a573ef2cba..966e8797f6b7 100644
--- a/ucm2/bytcr-rt5651/HiFi-Components.conf
+++ b/ucm2/bytcr-rt5651/HiFi-Components.conf
@@ -50,17 +50,6 @@ If.dmic {
}
}
-If.in1 {
- Condition {
- Type String
- Haystack "${CardComponents}"
- Needle "cfg-mic:in1"
- }
- True {
- <codecs/rt5651/IN1-InternalMic.conf>
- }
-}
-
If.in2 {
Condition {
Type String
@@ -81,4 +70,16 @@ If.in12 {
True {
<codecs/rt5651/IN12-InternalMic.conf>
}
+ False {
+ If.in1 {
+ Condition {
+ Type String
+ Haystack "${CardComponents}"
+ Needle "cfg-mic:in1"
+ }
+ True {
+ <codecs/rt5651/IN1-InternalMic.conf>
+ }
+ }
+ }
}
--
2.16.4

45
0016-ucm-fix-wrong-If-in-sequence-in-HiFi-dual.conf.patch Normal file
View File

@ -0,0 +1,45 @@
From 63ae90d6366b9a787baf9af3ebed4207679b0789 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 25 May 2020 20:57:43 +0200
Subject: [PATCH] ucm: fix wrong If in sequence in HiFi-dual.conf
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/HDA-Intel/HiFi-dual.conf | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/ucm2/HDA-Intel/HiFi-dual.conf b/ucm2/HDA-Intel/HiFi-dual.conf
index 277894ada2f7..2eb74ee7a0c7 100644
--- a/ucm2/HDA-Intel/HiFi-dual.conf
+++ b/ucm2/HDA-Intel/HiFi-dual.conf
@@ -74,16 +74,19 @@ SectionDevice."Line2" {
EnableSequence [
cset "name='Input Source' Line"
- If.0 {
- Condition {
- Type ControlExists
- Control "name='Line Boost Volume'"
- }
- True {
+ ]
+
+ If.0 {
+ Condition {
+ Type ControlExists
+ Control "name='Line Boost Volume'"
+ }
+ True {
+ EnableSequence [
cset "name='Line Boost Volume' 3"
- }
+ ]
}
- ]
+ }
}
SectionDevice."Mic2" {
--
2.16.4

232
0100-ucm2-Add-profile-for-Chromebook-Asus-C300.patch Normal file
View File

@ -0,0 +1,232 @@
From 383b14abd6dbb80a55b10cb8a5619a9601eda373 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 12 May 2020 17:46:14 +0200
Subject: [PATCH] ucm2: Add profile for Chromebook Asus C300
ASUS Chromebook C300 alias Google QUAWKS is an Intel Baytrail platform
with max98090 codec. This patch adds the basic UCM snippet for the
max98090 codec and HiFi.conf for this model.
Note that MIC2 is used for the headset mic. If another model with
this codec uses a different ADC port, we'd need to create another
profile snippet and rename the device.
BugLink: https://apibugzilla.suse.com/show_bug.cgi?id=1171492
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
ucm2/chtmax98090/GOOGLE-Quawks-1.0.conf | 6 ++++++
ucm2/chtmax98090/HiFi-Quawks.conf | 18 ++++++++++++++++++
ucm2/codecs/max98090/EnableSeq.conf | 25 +++++++++++++++++++++++++
ucm2/codecs/max98090/Headphones.conf | 25 +++++++++++++++++++++++++
ucm2/codecs/max98090/HeadsetMic.conf | 32 ++++++++++++++++++++++++++++++++
ucm2/codecs/max98090/InternalMic.conf | 25 +++++++++++++++++++++++++
ucm2/codecs/max98090/Speaker.conf | 24 ++++++++++++++++++++++++
7 files changed, 155 insertions(+)
create mode 100644 ucm2/chtmax98090/GOOGLE-Quawks-1.0.conf
create mode 100644 ucm2/chtmax98090/HiFi-Quawks.conf
create mode 100644 ucm2/codecs/max98090/EnableSeq.conf
create mode 100644 ucm2/codecs/max98090/Headphones.conf
create mode 100644 ucm2/codecs/max98090/HeadsetMic.conf
create mode 100644 ucm2/codecs/max98090/InternalMic.conf
create mode 100644 ucm2/codecs/max98090/Speaker.conf
diff --git a/ucm2/chtmax98090/GOOGLE-Quawks-1.0.conf b/ucm2/chtmax98090/GOOGLE-Quawks-1.0.conf
new file mode 100644
index 000000000000..850897fe2f2a
--- /dev/null
+++ b/ucm2/chtmax98090/GOOGLE-Quawks-1.0.conf
@@ -0,0 +1,6 @@
+Syntax 2
+Comment "ASUS C300 built-in audio"
+SectionUseCase."HiFi" {
+ File "HiFi-Quawks.conf"
+ Comment "Default"
+}
diff --git a/ucm2/chtmax98090/HiFi-Quawks.conf b/ucm2/chtmax98090/HiFi-Quawks.conf
new file mode 100644
index 000000000000..37d582130657
--- /dev/null
+++ b/ucm2/chtmax98090/HiFi-Quawks.conf
@@ -0,0 +1,18 @@
+SectionVerb {
+ Value {
+ TQ "HiFi"
+ }
+
+ EnableSequence [
+ <platforms/bytcr/PlatformEnableSeq.conf>
+ <codecs/max98090/EnableSeq.conf>
+ # volume values modified
+ cset "name='Headphone Volume' 25"
+ cset "name='Speaker Volume' 32"
+ ]
+}
+
+<codecs/max98090/Headphones.conf>
+<codecs/max98090/Speaker.conf>
+<codecs/max98090/InternalMic.conf>
+<codecs/max98090/HeadsetMic.conf>
diff --git a/ucm2/codecs/max98090/EnableSeq.conf b/ucm2/codecs/max98090/EnableSeq.conf
new file mode 100644
index 000000000000..a04420f4af3d
--- /dev/null
+++ b/ucm2/codecs/max98090/EnableSeq.conf
@@ -0,0 +1,25 @@
+cset "name='Left Speaker Mixer Left DAC Switch' on"
+cset "name='Right Speaker Mixer Right DAC Switch' on"
+cset "name='Digital EQ 3 Band Switch' off"
+cset "name='Digital EQ 5 Band Switch' off"
+cset "name='Digital EQ 7 Band Switch' off"
+cset "name='Biquad Switch' off"
+cset "name='Filter Mode' Music"
+cset "name='ADC Oversampling Rate' 0"
+
+cset "name='DMIC Mux' DMIC"
+cset "name='MIC2 Mux' IN34"
+cset "name='MIC2 Volume' 10"
+cset "name='MIC2 Boost Volume' 0"
+
+cset "name='ADCR Boost Volume' 4"
+cset "name='ADCL Boost Volume' 4"
+cset "name='ADCR Volume' 11"
+cset "name='ADCL Volume' 11"
+
+cset "name='Headphone Volume' 10"
+cset "name='Speaker Volume' 10"
+
+cset "name='Speaker Left Mixer Volume' 3"
+cset "name='Speaker Right Mixer Volume' 3"
+cset "name='Playback Path DC Blocking' on"
diff --git a/ucm2/codecs/max98090/Headphones.conf b/ucm2/codecs/max98090/Headphones.conf
new file mode 100644
index 000000000000..66f99a461512
--- /dev/null
+++ b/ucm2/codecs/max98090/Headphones.conf
@@ -0,0 +1,25 @@
+SectionDevice."Headphones" {
+ Comment "Headphones"
+
+ Value {
+ PlaybackPriority 200
+ PlaybackPCM "hw:${CardId}"
+ JackControl "Headphone Jack"
+ }
+
+ ConflictingDevice [
+ "Speaker"
+ ]
+
+ EnableSequence [
+ cset "name='Headphone Left Switch' on"
+ cset "name='Headphone Right Switch' on"
+ cset "name='Headphone Switch' on"
+ ]
+
+ DisableSequence [
+ cset "name='Headphone Left Switch' off"
+ cset "name='Headphone Right Switch' off"
+ cset "name='Headphone Switch' off"
+ ]
+}
diff --git a/ucm2/codecs/max98090/HeadsetMic.conf b/ucm2/codecs/max98090/HeadsetMic.conf
new file mode 100644
index 000000000000..43f5e9c38c3f
--- /dev/null
+++ b/ucm2/codecs/max98090/HeadsetMic.conf
@@ -0,0 +1,32 @@
+# Headset Microphone via MIC2
+SectionDevice."Headset" {
+ Comment "Headset Microphone"
+
+ Value {
+ CapturePriority 200
+ CapturePCM "hw:${CardId}"
+ JackControl "Headset Mic Jack"
+ }
+
+ ConflictingDevice [
+ "Mic"
+ ]
+
+ EnableSequence [
+ cset "name='Headset Mic Switch' on"
+ cset "name='DMIC Mux' ADC"
+ cset "name='Record Path DC Blocking' on"
+
+ cset "name='Left ADC Mixer MIC2 Switch' on"
+ cset "name='Right ADC Mixer MIC2 Switch' on"
+ ]
+
+ DisableSequence [
+ cset "name='Headset Mic Switch' off"
+ cset "name='DMIC Mux' DMIC"
+ cset "name='Record Path DC Blocking' off"
+
+ cset "name='Left ADC Mixer MIC2 Switch' off"
+ cset "name='Right ADC Mixer MIC2 Switch' off"
+ ]
+}
diff --git a/ucm2/codecs/max98090/InternalMic.conf b/ucm2/codecs/max98090/InternalMic.conf
new file mode 100644
index 000000000000..01967a65e8e0
--- /dev/null
+++ b/ucm2/codecs/max98090/InternalMic.conf
@@ -0,0 +1,25 @@
+# internal microphone via DMIC
+SectionDevice."Mic" {
+ Comment "Internal Microphone"
+
+ Value {
+ CapturePriority 100
+ CapturePCM "hw:${CardId}"
+ }
+
+ ConflictingDevice [
+ "Mic"
+ ]
+
+ EnableSequence [
+ cset "name='Int Mic Switch' on"
+ cset "name='DMIC Mux' DMIC"
+ cset "name='Record Path DC Blocking' off"
+ ]
+
+ DisableSequence [
+ cset "name='Int Mic Switch' off"
+ cset "name='DMIC Mux' ADC"
+ cset "name='Record Path DC Blocking' on"
+ ]
+}
diff --git a/ucm2/codecs/max98090/Speaker.conf b/ucm2/codecs/max98090/Speaker.conf
new file mode 100644
index 000000000000..fc65e5e204cf
--- /dev/null
+++ b/ucm2/codecs/max98090/Speaker.conf
@@ -0,0 +1,24 @@
+SectionDevice."Speaker" {
+ Comment "Speaker"
+
+ Value {
+ PlaybackPriority 100
+ PlaybackPCM "hw:${CardId}"
+ }
+
+ ConflictingDevice [
+ "Headphones"
+ ]
+
+ EnableSequence [
+ cset "name='Speaker Left Switch' on"
+ cset "name='Speaker Right Switch' on"
+ cset "name='Ext Spk Switch' on"
+ ]
+
+ DisableSequence [
+ cset "name='Speaker Left Switch' off"
+ cset "name='Speaker Right Switch' off"
+ cset "name='Ext Spk Switch' off"
+ ]
+}
--
2.16.4

13
alsa-ucm-conf.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed May 27 08:21:26 CEST 2020 - tiwai@suse.de
- More catch up of upstream fixes: mostly cosmetic style fixes:
0011-ucm2-remove-empty-enable-disable-sequence-sections.patch
0012-ucm2-fix-indentation-use-tabs.patch
0013-Add-initial-support-for-Realtek-ALC1220-TRX40-mother.patch
0014-ucm2-fix-chtrt5650-configuration-ucm-validator.patch
0015-bytcr-rt5651-fix-the-cfg-mic-in1-cfg-mic-in12-match-.patch
0016-ucm-fix-wrong-If-in-sequence-in-HiFi-dual.conf.patch
- Add UCM profile for Chromebook Asus C300 (bsc#1171492):
0100-ucm2-Add-profile-for-Chromebook-Asus-C300.patch
-------------------------------------------------------------------
Mon Apr 20 18:04:59 CEST 2020 - tiwai@suse.de

14
alsa-ucm-conf.spec
View File

@ -33,6 +33,13 @@ Patch7: 0007-chtrt5645-Add-ASUSTeKCOMPUTERINC.-T100HAN-1.0-symlin.patch
Patch8: 0008-chtrt5645-Add-MEDION-E1239TMD60568-0.1-Wingman.conf-.patch
Patch9: 0009-chtrt5645-Remove-bogus-JackHWMute-settings.patch
Patch10: 0010-sof-hda-dsp-change-Headphones2-to-Mic2.patch
Patch11: 0011-ucm2-remove-empty-enable-disable-sequence-sections.patch
Patch12: 0012-ucm2-fix-indentation-use-tabs.patch
Patch13: 0013-Add-initial-support-for-Realtek-ALC1220-TRX40-mother.patch
Patch14: 0014-ucm2-fix-chtrt5650-configuration-ucm-validator.patch
Patch15: 0015-bytcr-rt5651-fix-the-cfg-mic-in1-cfg-mic-in12-match-.patch
Patch16: 0016-ucm-fix-wrong-If-in-sequence-in-HiFi-dual.conf.patch
Patch100: 0100-ucm2-Add-profile-for-Chromebook-Asus-C300.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -51,6 +58,13 @@ This package contains the profiles files for ALSA UCM (Use Case Manager).
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch100 -p1
%build