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

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

Browse Source 
- Update to alsa-ucm-conf 1.2.3:
  including previous fixes, see the detailed changes at:
  https://www.alsa-project.org/wiki/Detailed_changes_v1.2.2_v1.2.3
- Dropped obsoleted patches:
  0001-sof-bdw-rt5677-initial-port-to-UCM2.patch
  0002-ucm2-treewide-JackHWMute-fixes.patch
  0003-sof-hda-dsp-Support-systems-without-integrated-graph.patch
  0004-hda-dsp-add-basic-ucm-config.patch
  0005-update-README-files.patch
  0006-bytcr-rt5651-Fix-dmic-check-in-HiFi-Components.conf.patch
  0007-chtrt5645-Add-ASUSTeKCOMPUTERINC.-T100HAN-1.0-symlin.patch
  0008-chtrt5645-Add-MEDION-E1239TMD60568-0.1-Wingman.conf-.patch
  0009-chtrt5645-Remove-bogus-JackHWMute-settings.patch
  0010-sof-hda-dsp-change-Headphones2-to-Mic2.patch
  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
  0100-ucm2-Add-profile-for-Chromebook-Asus-C300.patch

OBS-URL: https://build.opensuse.org/request/show/812889
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-ucm-conf?expand=0&rev=15
This commit is contained in:
Takashi Iwai 2020-06-09 11:31:50 +00:00 committed by Git OBS Bridge
parent 823fc1a5be
commit a48ce21224
21 changed files with 29 additions and 1759 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

235
0001-sof-bdw-rt5677-initial-port-to-UCM2.patch
View File

@ -1,235 +0,0 @@
From 46222753fdddc86d6a0b92c465875f71c628a779 Mon Sep 17 00:00:00 2001
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Date: Thu, 27 Feb 2020 12:40:20 -0600
Subject: [PATCH 1/3] sof-bdw-rt5677: initial port to UCM2
Tested on Pixel 2015/SAMUS Chromebook.
Known limitations:
Left/Right confusion (probably a firmware issue)
PulseAudio does not switch capture devices on headset plug
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/sof-bdw-rt5677/HiFi.conf | 194 ++++++++++++++++++++++++++++++++
ucm2/sof-bdw-rt5677/sof-bdw-rt5677.conf | 6 +
2 files changed, 200 insertions(+)
create mode 100644 ucm2/sof-bdw-rt5677/HiFi.conf
create mode 100644 ucm2/sof-bdw-rt5677/sof-bdw-rt5677.conf
diff --git a/ucm2/sof-bdw-rt5677/HiFi.conf b/ucm2/sof-bdw-rt5677/HiFi.conf
new file mode 100644
index 000000000000..f4b144996d37
--- /dev/null
+++ b/ucm2/sof-bdw-rt5677/HiFi.conf
@@ -0,0 +1,194 @@
+# Use case Configuration for sof-bdw-rt5677
+# command-line sequence to switch playback/capture
+# alsaucm -c sof-bdw-rt5677 set _verb HiFi
+# alsaucm -c sof-bdw-rt5677 set _verb HiFi set _enadev Headphones
+
+
+SectionVerb {
+
+ EnableSequence [
+
+ cset "name='PDM1 L Mux' STO1 DAC MIX"
+ cset "name='PDM1 R Mux' STO1 DAC MIX"
+
+ # Adjust Master Playback volume if needed
+ # cset "name='Master Playback Volume' 30"
+
+ cset "name='OUT1 Playback Switch' off"
+ cset "name='OUT2 Playback Switch' off"
+
+ cset "name='DAC1 Playback Volume' 175"
+ cset "name='DAC2 Playback Volume' 175"
+ cset "name='DAC12 SRC Mux' STO1 DAC MIX"
+
+ cset "name='Stereo DAC MIXL ST L Switch' off"
+ cset "name='Stereo DAC MIXL DAC1 L Switch' off"
+ cset "name='Stereo DAC MIXL DAC2 L Switch' off"
+ cset "name='Stereo DAC MIXL DAC1 R Switch' on"
+
+ cset "name='Stereo DAC MIXR ST R Switch' off"
+ cset "name='Stereo DAC MIXR DAC1 R Switch' off"
+ cset "name='Stereo DAC MIXR DAC2 R Switch' off"
+ cset "name='Stereo DAC MIXR DAC1 L Switch' on"
+
+ cset "name='DAC1 MIXL Stereo ADC Switch' off"
+ cset "name='DAC1 MIXL DAC1 Switch' on"
+
+ cset "name='DAC1 MIXR Stereo ADC Switch' off"
+ cset "name='DAC1 MIXR DAC1 Switch' on"
+
+ cset "name='DAC1 Mux' IF1 DAC 01"
+
+ cset "name='Stereo1 DMIC Mux' DMIC1"
+ cset "name='Stereo1 ADC2 Mux' DMIC"
+ cset "name='Stereo1 ADC1 Mux' ADC1/2"
+
+ cset "name='Sto1 ADC MIXL ADC1 Switch' off"
+ cset "name='Sto1 ADC MIXL ADC2 Switch' off"
+ cset "name='Sto1 ADC MIXL ADC2 Switch' on"
+
+ cset "name='Sto1 ADC MIXR ADC1 Switch' off"
+ cset "name='Sto1 ADC MIXR ADC2 Switch' off"
+ cset "name='Sto1 ADC MIXR ADC2 Switch' on"
+
+ cset "name='IF1 ADC1 Mux' STO1 ADC MIX"
+ cset "name='IF1 ADC1 Swap Mux' L/R"
+
+ # Adjust Mic Capture Volume if needed
+ # cset "name='Mic Capture Volume' 30"
+
+ cset "name='ADC1 Capture Switch' on"
+ cset "name='ADC1 Capture Volume' 31"
+ cset "name='STO1 ADC Boost Volume' 2"
+
+ cset "name='Headphone Switch' off"
+ cset "name='Speaker Switch' on"
+
+ cset "name='Remote DMICs Switch' on"
+ cset "name='Mono DMIC L Mux' DMIC1"
+ cset "name='Mono ADC2 L Mux' DMIC"
+ cset "name='Mono ADC MIXL ADC1 Switch' off"
+ cset "name='Mono ADC MIXL ADC2 Switch' on"
+ cset "name='VAD ADC Mux' MONO ADC MIX L"
+ cset "name='IB01 Mux' VAD ADC/DAC1 FS"
+ cset "name='IB01 Bypass Mux' Bypass"
+ cset "name='Mono ADC Boost Volume' 2"
+ ]
+
+ DisableSequence [
+ ]
+}
+
+SectionDevice."Speaker" {
+ Comment "Speakers"
+
+ ConflictingDevice [
+ "Headphones"
+ ]
+
+ EnableSequence [
+ ]
+
+ DisableSequence [
+ ]
+
+ Value {
+ PlaybackPriority 100
+ PlaybackPCM "hw:${CardId}"
+ }
+}
+
+
+SectionDevice."Headphones" {
+ Comment "Headphones"
+
+ ConflictingDevice [
+ "Speaker"
+ ]
+
+ EnableSequence [
+ cset "name='Speaker Switch' off"
+ cset "name='Stereo DAC MIXL DAC1 R Switch' off"
+ cset "name='Stereo DAC MIXR DAC1 L Switch' off"
+ cset "name='Stereo DAC MIXL DAC1 L Switch' on"
+ cset "name='Stereo DAC MIXR DAC1 R Switch' on"
+ cset "name='OUT1 Playback Switch' on"
+ cset "name='OUT2 Playback Switch' on"
+ cset "name='Headphone Switch' on"
+ ]
+
+ DisableSequence [
+ cset "name='Headphone Switch' off"
+ cset "name='OUT1 Playback Switch' off"
+ cset "name='OUT2 Playback Switch' off"
+ cset "name='Stereo DAC MIXL DAC1 L Switch' off"
+ cset "name='Stereo DAC MIXR DAC1 R Switch' off"
+ cset "name='Stereo DAC MIXL DAC1 R Switch' on"
+ cset "name='Stereo DAC MIXR DAC1 L Switch' on"
+ cset "name='Speaker Switch' on"
+ ]
+
+ Value {
+ PlaybackPriority 300
+ PlaybackPCM "hw:${CardId}"
+ JackControl "Headphone Jack"
+ JackHWMute "Speakers"
+ }
+}
+
+SectionDevice."Mic" {
+ Comment "Internal Microphone"
+
+ ConflictingDevice [
+ "Headset"
+ ]
+
+ EnableSequence [
+ ]
+
+ DisableSequence [
+ ]
+
+ Value {
+ CapturePriority 100
+ CapturePCM "hw:${CardId}"
+ }
+}
+
+SectionDevice."Headset" {
+ Comment "Headset Microphone"
+
+ ConflictingDevice [
+ "Mic"
+ ]
+
+ EnableSequence [
+ cset "name='Sto1 ADC MIXL ADC2 Switch' off"
+ cset "name='Sto1 ADC MIXR ADC2 Switch' off"
+ cset "name='Local DMICs Switch' off"
+
+ cset "name='IF1 ADC1 Swap Mux' L/L"
+
+ cset "name='Sto1 ADC MIXL ADC1 Switch' on"
+ cset "name='Sto1 ADC MIXR ADC1 Switch' on"
+ cset "name='Headset Mic Switch' on"
+ ]
+
+ DisableSequence [
+ cset "name='Sto1 ADC MIXL ADC1 Switch' off"
+ cset "name='Sto1 ADC MIXR ADC1 Switch' off"
+ cset "name='Headset Mic Switch' off"
+
+ cset "name='IF1 ADC1 Swap Mux' L/R"
+
+ cset "name='Sto1 ADC MIXL ADC2 Switch' on"
+ cset "name='Sto1 ADC MIXR ADC2 Switch' on"
+ cset "name='Local DMICs Switch' on"
+ ]
+
+ Value {
+ CapturePriority 300
+ CapturePCM "hw:${CardId}"
+ JackControl "Mic Jack"
+ }
+}
diff --git a/ucm2/sof-bdw-rt5677/sof-bdw-rt5677.conf b/ucm2/sof-bdw-rt5677/sof-bdw-rt5677.conf
new file mode 100644
index 000000000000..d672df281af8
--- /dev/null
+++ b/ucm2/sof-bdw-rt5677/sof-bdw-rt5677.conf
@@ -0,0 +1,6 @@
+Syntax 2
+
+SectionUseCase."HiFi" {
+ File "HiFi.conf"
+ Comment "Default"
+}
--
2.16.4

81
0002-ucm2-treewide-JackHWMute-fixes.patch
View File

@ -1,81 +0,0 @@
From da45a07c756308b57facf1a97c4842274ff04fe3 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 1 Mar 2020 16:12:28 +0100
Subject: [PATCH 2/3] ucm2: treewide - JackHWMute fixes
Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/14
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/HDA-Intel/HiFi-dual.conf | 1 +
ucm2/broxton-rt298/HiFi.conf | 1 -
ucm2/chtrt5645/HiFi-dmic2.conf | 2 +-
ucm2/skylake-rt286/HiFi.conf | 1 -
ucm2/sof-bdw-rt5677/HiFi.conf | 2 +-
5 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ucm2/HDA-Intel/HiFi-dual.conf b/ucm2/HDA-Intel/HiFi-dual.conf
index 174fef4787b1..277894ada2f7 100644
--- a/ucm2/HDA-Intel/HiFi-dual.conf
+++ b/ucm2/HDA-Intel/HiFi-dual.conf
@@ -93,6 +93,7 @@ SectionDevice."Mic2" {
CapturePriority 300
CapturePCM "hw:${CardId}"
JackHWMute "Line2"
+ JackControl "Mic Jack"
}
ConflictingDevice [
diff --git a/ucm2/broxton-rt298/HiFi.conf b/ucm2/broxton-rt298/HiFi.conf
index 6f5b9a594f65..f7e561f9c4eb 100644
--- a/ucm2/broxton-rt298/HiFi.conf
+++ b/ucm2/broxton-rt298/HiFi.conf
@@ -30,7 +30,6 @@ SectionDevice."Speaker" {
Value {
PlaybackPriority 100
PlaybackPCM "hw:${CardId}"
- JackHWMute "Headphones"
}
}
diff --git a/ucm2/chtrt5645/HiFi-dmic2.conf b/ucm2/chtrt5645/HiFi-dmic2.conf
index c9fdd79e4cd0..d3f880aa6bc0 100644
--- a/ucm2/chtrt5645/HiFi-dmic2.conf
+++ b/ucm2/chtrt5645/HiFi-dmic2.conf
@@ -98,7 +98,7 @@ SectionDevice."Headset" {
CapturePriority 200
CapturePCM "hw:${CardId}"
JackControl "Headset Mic Jack"
- JackHWMute "DMic"
+ JackHWMute "Mic"
}
EnableSequence [
diff --git a/ucm2/skylake-rt286/HiFi.conf b/ucm2/skylake-rt286/HiFi.conf
index 9e94a1b1072d..ed4bfa73c095 100644
--- a/ucm2/skylake-rt286/HiFi.conf
+++ b/ucm2/skylake-rt286/HiFi.conf
@@ -51,7 +51,6 @@ SectionDevice."Speaker" {
Value {
PlaybackPriority 100
PlaybackPCM "hw:${CardId}"
- JackHWMute "Headphones"
}
}
diff --git a/ucm2/sof-bdw-rt5677/HiFi.conf b/ucm2/sof-bdw-rt5677/HiFi.conf
index f4b144996d37..724a1cc3fbdf 100644
--- a/ucm2/sof-bdw-rt5677/HiFi.conf
+++ b/ucm2/sof-bdw-rt5677/HiFi.conf
@@ -132,7 +132,7 @@ SectionDevice."Headphones" {
PlaybackPriority 300
PlaybackPCM "hw:${CardId}"
JackControl "Headphone Jack"
- JackHWMute "Speakers"
+ JackHWMute "Speaker"
}
}
--
2.16.4

140
0003-sof-hda-dsp-Support-systems-without-integrated-graph.patch
View File

@ -1,140 +0,0 @@
From 4722f5b3859903521ba0f92a64d86af31083ca50 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Thu, 5 Mar 2020 14:59:56 +0200
Subject: [PATCH 3/3] sof-hda-dsp: Support systems without integrated graphics
audio
On systems where integrated graphics audio is not present
or is disabled, the HDMI PCM nodes are disabled. Add rules to
detect these systems by checking presence of HDMI jack controls
with UCM2 rules.
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/sof-hda-dsp/Hdmi.conf | 96 +++++++++++++++++++++++++++++-----------------
1 file changed, 60 insertions(+), 36 deletions(-)
diff --git a/ucm2/sof-hda-dsp/Hdmi.conf b/ucm2/sof-hda-dsp/Hdmi.conf
index be6cb39945c5..6f2c4aa99db2 100644
--- a/ucm2/sof-hda-dsp/Hdmi.conf
+++ b/ucm2/sof-hda-dsp/Hdmi.conf
@@ -1,55 +1,79 @@
# Use case Configuration for sof-hda-dsp
-SectionDevice."HDMI1" {
- Comment "HDMI1/DP1 Output"
+If.hdmi1 {
+ Condition {
+ Type ControlExists
+ Control "iface=CARD,name='HDMI/DP,pcm=3 Jack'"
+ }
+ True {
+ SectionDevice."HDMI1" {
+ Comment "HDMI1/DP1 Output"
- EnableSequence [
- cset "name='IEC958 Playback Switch' on"
- ]
+ EnableSequence [
+ cset "name='IEC958 Playback Switch' on"
+ ]
- DisableSequence [
- cset "name='IEC958 Playback Switch' off"
- ]
+ DisableSequence [
+ cset "name='IEC958 Playback Switch' off"
+ ]
- Value {
- PlaybackPriority 500
- PlaybackPCM "hw:${CardId},3"
- JackControl "HDMI/DP,pcm=3 Jack"
+ Value {
+ PlaybackPriority 500
+ PlaybackPCM "hw:${CardId},3"
+ JackControl "HDMI/DP,pcm=3 Jack"
+ }
+ }
}
}
-SectionDevice."HDMI2" {
- Comment "HDMI2/DP2 Output"
+If.hdmi2 {
+ Condition {
+ Type ControlExists
+ Control "iface=CARD,name='HDMI/DP,pcm=4 Jack'"
+ }
+ True {
+ SectionDevice."HDMI2" {
+ Comment "HDMI2/DP2 Output"
- EnableSequence [
- cset "name='IEC958 Playback Switch',index=1 on"
- ]
+ EnableSequence [
+ cset "name='IEC958 Playback Switch',index=1 on"
+ ]
- DisableSequence [
- cset "name='IEC958 Playback Switch',index=1 off"
- ]
+ DisableSequence [
+ cset "name='IEC958 Playback Switch',index=1 off"
+ ]
- Value {
- PlaybackPriority 600
- PlaybackPCM "hw:${CardId},4"
- JackControl "HDMI/DP,pcm=4 Jack"
+ Value {
+ PlaybackPriority 600
+ PlaybackPCM "hw:${CardId},4"
+ JackControl "HDMI/DP,pcm=4 Jack"
+ }
+ }
}
}
-SectionDevice."HDMI3" {
- Comment "HDMI3/DP3 Output"
+If.hdmi3 {
+ Condition {
+ Type ControlExists
+ Control "iface=CARD,name='HDMI/DP,pcm=5 Jack'"
+ }
+ True {
+ SectionDevice."HDMI3" {
+ Comment "HDMI3/DP3 Output"
- EnableSequence [
- cset "name='IEC958 Playback Switch',index=2 on"
- ]
+ EnableSequence [
+ cset "name='IEC958 Playback Switch',index=2 on"
+ ]
- DisableSequence [
- cset "name='IEC958 Playback Switch',index=2 off"
- ]
+ DisableSequence [
+ cset "name='IEC958 Playback Switch',index=2 off"
+ ]
- Value {
- PlaybackPriority 700
- PlaybackPCM "hw:${CardId},5"
- JackControl "HDMI/DP,pcm=5 Jack"
+ Value {
+ PlaybackPriority 700
+ PlaybackPCM "hw:${CardId},5"
+ JackControl "HDMI/DP,pcm=5 Jack"
+ }
+ }
}
}
--
2.16.4

208
0004-hda-dsp-add-basic-ucm-config.patch
View File

@ -1,208 +0,0 @@
From 76df616aa2fcae1cca1f948dac24c98a211c2593 Mon Sep 17 00:00:00 2001
From: Mateusz Gorski <mateusz.gorski@linux.intel.com>
Date: Wed, 18 Mar 2020 11:26:05 +0100
Subject: [PATCH 04/10] hda-dsp: add basic ucm config
Basic UCM configuration for Intel Skylake SST with HDA DSP generic
machine driver enabling codec playback and capture on both HDA codec
and DMIC ports.
Signed-off-by: Mateusz Gorski <mateusz.gorski@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/hda-dsp/Hdmi1.conf | 24 ++++++++++++
ucm2/hda-dsp/Hdmi2.conf | 23 ++++++++++++
ucm2/hda-dsp/HiFi.conf | 96 +++++++++++++++++++++++++++++++++++++++++++++++
ucm2/hda-dsp/hda-dsp.conf | 16 ++++++++
4 files changed, 159 insertions(+)
create mode 100644 ucm2/hda-dsp/Hdmi1.conf
create mode 100644 ucm2/hda-dsp/Hdmi2.conf
create mode 100644 ucm2/hda-dsp/HiFi.conf
create mode 100644 ucm2/hda-dsp/hda-dsp.conf
diff --git a/ucm2/hda-dsp/Hdmi1.conf b/ucm2/hda-dsp/Hdmi1.conf
new file mode 100644
index 000000000000..08fa5ddf779f
--- /dev/null
+++ b/ucm2/hda-dsp/Hdmi1.conf
@@ -0,0 +1,24 @@
+# Usecase for device HDMI1/Display Port stereo playback on Intel cAVS platforms
+# For Audio in HDA mode
+
+SectionDevice."HDMI1" {
+ Comment "HDMI/Display Port 1 Stereo"
+
+ Value {
+ PlaybackPriority 300
+ PlaybackPCM "hw:${CardId},10"
+ If.1 {
+ Condition {
+ Type ControlExists
+ Control "iface=CARD,name='HDMI/DP,pcm=17 Jack'"
+ }
+ True {
+ JackControl "HDMI/DP,pcm=17 Jack"
+ }
+ False {
+ JackControl "HDMI/DP, pcm=17 Jack"
+ }
+ }
+ }
+}
+
diff --git a/ucm2/hda-dsp/Hdmi2.conf b/ucm2/hda-dsp/Hdmi2.conf
new file mode 100644
index 000000000000..eb168eac15fe
--- /dev/null
+++ b/ucm2/hda-dsp/Hdmi2.conf
@@ -0,0 +1,23 @@
+# Usecase for device HDMI2/Display Port stereo playback on Intel cAVS platforms
+# For Audio in HDA mode
+
+SectionDevice."HDMI2" {
+ Comment "HDMI/Display Port 2 Stereo"
+
+ Value {
+ PlaybackPriority 400
+ PlaybackPCM "hw:${CardId},11"
+ If.1 {
+ Condition {
+ Type ControlExists
+ Control "iface=CARD,name='HDMI/DP,pcm=18 Jack'"
+ }
+ True {
+ JackControl "HDMI/DP,pcm=18 Jack"
+ }
+ False {
+ JackControl "HDMI/DP, pcm=18 Jack"
+ }
+ }
+ }
+}
diff --git a/ucm2/hda-dsp/HiFi.conf b/ucm2/hda-dsp/HiFi.conf
new file mode 100644
index 000000000000..cdeb215832c7
--- /dev/null
+++ b/ucm2/hda-dsp/HiFi.conf
@@ -0,0 +1,96 @@
+# Usecase for stereo playback Speaker and Headset, Recording on DMIC and Headset MIC.
+# For Audio in HDA mode on Intel cAVS platforms
+
+SectionVerb {
+
+ EnableSequence [
+ cset "name='mch_cap_out mo mch_cap_in mi Switch' 1"
+ ]
+
+ Value {
+ TQ "HiFi"
+ }
+}
+
+SectionDevice."Headphones" {
+ Comment "Headphones"
+
+ ConflictingDevice [
+ "Speaker"
+ ]
+
+ EnableSequence [
+ cset "name='Headphone Playback Switch' 1,1"
+ cset "name='Speaker Playback Switch' 0,0"
+ ]
+
+ Value {
+ PlaybackPriority 200
+ PlaybackPCM "hw:${CardId},7"
+ PlaybackMixerElem "Headphone"
+ PlaybackMasterElem "Master"
+ PlaybackVolume "Headphone Playback Volume"
+ PlaybackSwitch "Headphone Playback Switch"
+ JackControl "Front Headphone Jack"
+ JackHWMute "Speaker"
+ }
+}
+
+SectionDevice."Speaker" {
+ Comment "Speaker"
+
+ ConflictingDevice [
+ "Headphones"
+ ]
+
+ EnableSequence [
+ cset "name='Headphone Playback Switch' 0,0"
+ cset "name='Speaker Playback Switch' 1,1"
+ ]
+
+ Value {
+ PlaybackPriority 100
+ PlaybackPCM "hw:${CardId},7"
+ PlaybackMixerElem "Speaker"
+ PlaybackMasterElem "Master"
+ PlaybackVolume "Speaker Playback Volume"
+ PlaybackSwitch "Speaker Playback Switch"
+ }
+}
+
+SectionDevice."Headset" {
+ Comment "Headset Microphone"
+
+ ConflictingDevice [
+ "Mic"
+ ]
+
+ EnableSequence [
+ cset "name='media0_out mo codec0_in mi Switch' 1"
+ ]
+
+ Value {
+ CapturePriority 200
+ CapturePCM "hw:${CardId},7"
+ }
+}
+
+SectionDevice."Mic" {
+ Comment "Digital Microphone"
+
+ ConflictingDevice [
+ "Headset"
+ ]
+
+ EnableSequence [
+ cset "name='mch_cap_out mo mch_cap_in mi Switch' 1"
+ ]
+
+ Value {
+ CapturePriority 100
+ CapturePCM "hw:${CardId},13"
+ }
+}
+
+<hda-dsp/Hdmi1.conf>
+<hda-dsp/Hdmi2.conf>
diff --git a/ucm2/hda-dsp/hda-dsp.conf b/ucm2/hda-dsp/hda-dsp.conf
new file mode 100644
index 000000000000..bf80b099349e
--- /dev/null
+++ b/ucm2/hda-dsp/hda-dsp.conf
@@ -0,0 +1,16 @@
+# UCM for Intel CAVS platforms
+# For Audio in HDA and DMIC mode
+
+Syntax 2
+
+SectionUseCase."HiFi" {
+ File "HiFi.conf"
+ Comment "Play HiFi quality Music"
+}
+
+SectionDefaults [
+ cset "name='Master Playback Switch' 1"
+ cset "name='codec0_out mo media0_in mi Switch' 1"
+ cset "name='media0_out mo codec0_in mi Switch' 1"
+ cset "name='mch_cap_out mo mch_cap_in mi Switch' 1"
+]
--
2.16.4

76
0005-update-README-files.patch
View File

@ -1,76 +0,0 @@
From 340b8a1d6aaa164bc27bdb8811cc00d729ca2e45 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 30 Mar 2020 16:51:45 +0200
Subject: [PATCH 05/10] update README files
- UCM validator
- UCM paths for ucm2/
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
README.md | 6 ++++++
ucm2/README.md | 34 +++++++++++++++++++++++++++++++---
2 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 574c93ca4189..c5afd963a7aa 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,9 @@
## ALSA Use Case Manager configuration
![Validate UCM configuration](https://github.com/alsa-project/alsa-ucm-conf/workflows/Validate%20UCM%20configuration/badge.svg?branch=master)
+
+The UCM configurations are automatically valited using the UCM validator
+available at https://github.com/alsa-project/alsa-tests/tree/master/python/ucm-validator .
+
+If you create a pull request for new hardware, please, add also the
+alsa-info.sh output to emulate this hardware in the UCM validator.
diff --git a/ucm2/README.md b/ucm2/README.md
index 3aefdf7e5c02..fc2a1785c6ce 100644
--- a/ucm2/README.md
+++ b/ucm2/README.md
@@ -7,9 +7,37 @@ Library directories:
codecs/
dsps/
-Those directories are not inspected for the list of
-available UCM configurations. They contain files
-included from other UCMs.
+Those directories are not inspected for the list of available UCM
+configurations. They contain files included from other UCMs.
+
+UCM master configuration path lookup (by priority):
+
+- {ucm_card_name}/{long_card_name}.conf
+- {ucm_card_name}/{ucm_card_name}.conf
+- {driver_name}/{long_card_name}.conf
+- {driver_name}/{driver_name}.conf
+
+For example:
+
+- USB-Audio/Dell-WD15-Dock.conf
+-- special configuration for the Dell docking station with USB soundcard
+- TwoCardsMix/TwoCardsMix.conf
+-- virtual UCM from two soundcards
+
+Note: For the driver configurations, use always the real driver name
+not the ucm card name configuration paths!
+
+The driver name can be obtained using procfs like:
+
+````
+ cat /proc/asound/cards
+ 1 [NVidia ]: HDA-Intel - HDA NVidia
+ HDA NVidia at 0xb5080000 irq 17
+
+ driver name: HDA-Intel
+ card short name: HDA NVidia
+ card long name: HDA NVidia at 0xb5080000 irq 17
+````
Syntax, value names
-------------------
--
2.16.4

45
0006-bytcr-rt5651-Fix-dmic-check-in-HiFi-Components.conf.patch
View File

@ -1,45 +0,0 @@
From 85ca26a4f2b73888dbce3437a402df13faf628fa Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 5 Apr 2020 20:34:50 +0200
Subject: [PATCH 06/10] bytcr-rt5651: Fix dmic check in HiFi-Components.conf
The kernel sets cfg-mic:dmic not cfg-mic:dmic1 when a digital mic is
used. The wrong check for cfg-mic:dmic1 causes there to be no "Mic"
device at all, which causes the check for the ConflictingDevices section
of the HeadSet (mic) device to fail like e.g. so:
[hans@localhost ~]$ alsaucm -c bytcr-rt5651 set _verb HiFi set _enadev Speaker
ALSA lib parser.c:1138:(verb_dev_list_add) error: unable to find device 'Mic'
ALSA lib parser.c:1433:(parse_verb_file) error: device management error in verb 'HiFi'
ALSA lib main.c:962:(snd_use_case_mgr_open) error: failed to import bytcr-rt5651 use case configuration -2
alsaucm: error failed to open sound card bytcr-rt5651: No such file or directory
This commit fixes this.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/bytcr-rt5651/HiFi-Components.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ucm2/bytcr-rt5651/HiFi-Components.conf b/ucm2/bytcr-rt5651/HiFi-Components.conf
index 53ebcbe252c8..d0a573ef2cba 100644
--- a/ucm2/bytcr-rt5651/HiFi-Components.conf
+++ b/ucm2/bytcr-rt5651/HiFi-Components.conf
@@ -34,11 +34,11 @@ If.headphones {
}
}
-If.dmic1 {
+If.dmic {
Condition {
Type String
Haystack "${CardComponents}"
- Needle "cfg-mic:dmic1"
+ Needle "cfg-mic:dmic"
}
True {
<codecs/rt5651/DigitalMic.conf>
--
2.16.4

33
0007-chtrt5645-Add-ASUSTeKCOMPUTERINC.-T100HAN-1.0-symlin.patch
View File

@ -1,33 +0,0 @@
From aaa86069ab721683afcf978b9291219855db42f1 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 5 Apr 2020 20:34:51 +0200
Subject: [PATCH 07/10] chtrt5645: Add ASUSTeKCOMPUTERINC.-T100HAN-1.0 symlink
to chtrt5645-dmic1.conf
We already have a ASUSTeKCOMPUTERINC.-T100HAN-1.0-T100HAN symlink to
chtrt5645-dmic1.conf, but since kernel commit 39870b0dec68 ("ASoC: DMI long
name - avoid to add board name if matches with product name"), the kernel
omits the (second) -T100HAN. So with newer kernels that no longer works.
Arguably this is a kernel regressions, but chances are we already have
some configs depending on the new behavior, so lets fix this on the
UCM2 side by adding a second symlink using the new long name.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/chtrt5645/ASUSTeKCOMPUTERINC.-T100HAN-1.0.conf | 1 +
1 file changed, 1 insertion(+)
create mode 120000 ucm2/chtrt5645/ASUSTeKCOMPUTERINC.-T100HAN-1.0.conf
diff --git a/ucm2/chtrt5645/ASUSTeKCOMPUTERINC.-T100HAN-1.0.conf b/ucm2/chtrt5645/ASUSTeKCOMPUTERINC.-T100HAN-1.0.conf
new file mode 120000
index 000000000000..b4d2816229b4
--- /dev/null
+++ b/ucm2/chtrt5645/ASUSTeKCOMPUTERINC.-T100HAN-1.0.conf
@@ -0,0 +1 @@
+chtrt5645-dmic1.conf
\ No newline at end of file
--
2.16.4

30
0008-chtrt5645-Add-MEDION-E1239TMD60568-0.1-Wingman.conf-.patch
View File

@ -1,30 +0,0 @@
From 5ba4fd1dfca593248a603e5621bf2f53a4e2ddcc Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 5 Apr 2020 20:34:52 +0200
Subject: [PATCH 08/10] chtrt5645: Add MEDION-E1239TMD60568-0.1-Wingman.conf
symlink to chtrt5645-dmic2.conf
The Medion Akoya E1239T 2-in-1 uses a digital mic connected to the
dmic2 pin, rather then the default analog mic on in2.
Add a long name symlink to chtrt5645-dmic2.conf for this, so that
the right config is used.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/chtrt5645/MEDION-E1239TMD60568-0.1-Wingman.conf | 1 +
1 file changed, 1 insertion(+)
create mode 120000 ucm2/chtrt5645/MEDION-E1239TMD60568-0.1-Wingman.conf
diff --git a/ucm2/chtrt5645/MEDION-E1239TMD60568-0.1-Wingman.conf b/ucm2/chtrt5645/MEDION-E1239TMD60568-0.1-Wingman.conf
new file mode 120000
index 000000000000..7823e312498e
--- /dev/null
+++ b/ucm2/chtrt5645/MEDION-E1239TMD60568-0.1-Wingman.conf
@@ -0,0 +1 @@
+chtrt5645-dmic2.conf
\ No newline at end of file
--
2.16.4

103
0009-chtrt5645-Remove-bogus-JackHWMute-settings.patch
View File

@ -1,103 +0,0 @@
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

58
0010-sof-hda-dsp-change-Headphones2-to-Mic2.patch
View File

@ -1,58 +0,0 @@
From 907c8309b2ee671e1b36630b0d29db1bc3124990 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 6 Apr 2020 17:37:20 +0200
Subject: [PATCH 10/10] sof-hda-dsp: change Headphones2 to Mic2
Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/19
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
ucm2/sof-hda-dsp/HiFi.conf | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf
index 60a869341935..9a8293077e3e 100644
--- a/ucm2/sof-hda-dsp/HiFi.conf
+++ b/ucm2/sof-hda-dsp/HiFi.conf
@@ -6,7 +6,7 @@ SectionVerb {
]
}
-SectionDevice."Headphones1" {
+SectionDevice."Headphones" {
Comment "Headphones"
EnableSequence [
@@ -85,9 +85,9 @@ If.monomic {
Control "name='Input Source'"
ControlEnum "Headphone Mic"
}
- After.SectionDevice "Mic"
+ After.SectionDevice "Mic1"
True {
- SectionDevice."Headphones2" {
+ SectionDevice."Mic2" {
Comment "Headphones Stereo Microphone"
ConflictingDevice [
@@ -120,7 +120,7 @@ If.monomic {
}
}
False {
- SectionDevice."Headphones2" {
+ SectionDevice."Mic2" {
Comment "Headphones Stereo Microphone"
Value {
@@ -132,7 +132,7 @@ If.monomic {
}
}
-SectionDevice."Mic" {
+SectionDevice."Mic1" {
Comment "Digital Microphone"
Value {
--
2.16.4

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

@ -1,93 +0,0 @@
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
View File

@ -1,92 +0,0 @@
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
View File

@ -1,116 +0,0 @@
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
View File

@ -1,82 +0,0 @@
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
View File

@ -1,52 +0,0 @@
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
View File

@ -1,45 +0,0 @@
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
View File

@ -1,232 +0,0 @@
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

3
alsa-ucm-conf-1.2.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ebfd929bc85a51f16fa3c8c4db13faa2ea6ff2b2266fc36d6198bdafe73c40c
size 14608

3
alsa-ucm-conf-1.2.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1bc24da04bb27a75e323c9f0fb03e44705b6bb8a8baf255b94b41d457d590d00
size 17482

25
alsa-ucm-conf.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Tue Jun 9 11:25:16 CEST 2020 - tiwai@suse.de
- Update to alsa-ucm-conf 1.2.3:
including previous fixes, see the detailed changes at:
https://www.alsa-project.org/wiki/Detailed_changes_v1.2.2_v1.2.3
- Dropped obsoleted patches:
0001-sof-bdw-rt5677-initial-port-to-UCM2.patch
0002-ucm2-treewide-JackHWMute-fixes.patch
0003-sof-hda-dsp-Support-systems-without-integrated-graph.patch
0004-hda-dsp-add-basic-ucm-config.patch
0005-update-README-files.patch
0006-bytcr-rt5651-Fix-dmic-check-in-HiFi-Components.conf.patch
0007-chtrt5645-Add-ASUSTeKCOMPUTERINC.-T100HAN-1.0-symlin.patch
0008-chtrt5645-Add-MEDION-E1239TMD60568-0.1-Wingman.conf-.patch
0009-chtrt5645-Remove-bogus-JackHWMute-settings.patch
0010-sof-hda-dsp-change-Headphones2-to-Mic2.patch
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
0100-ucm2-Add-profile-for-Chromebook-Asus-C300.patch
-------------------------------------------------------------------
Wed May 27 08:21:26 CEST 2020 - tiwai@suse.de

36
alsa-ucm-conf.spec
View File

@ -17,29 +17,12 @@
Name: alsa-ucm-conf
Version: 1.2.2
Version: 1.2.3
Release: 0
Summary: ALSA UCM Profiles
License: BSD-3-Clause
Url: http://www.alsa-project.org/
Source: ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-%{version}.tar.bz2
Patch1: 0001-sof-bdw-rt5677-initial-port-to-UCM2.patch
Patch2: 0002-ucm2-treewide-JackHWMute-fixes.patch
Patch3: 0003-sof-hda-dsp-Support-systems-without-integrated-graph.patch
Patch4: 0004-hda-dsp-add-basic-ucm-config.patch
Patch5: 0005-update-README-files.patch
Patch6: 0006-bytcr-rt5651-Fix-dmic-check-in-HiFi-Components.conf.patch
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
@ -48,23 +31,6 @@ This package contains the profiles files for ALSA UCM (Use Case Manager).
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch100 -p1
%build