UCM2 fixes for sof-hda-dsp
This commit is contained in:
parent
04d13aff9a
commit
c40825430a
@ -9,7 +9,7 @@
|
|||||||
Summary: The Advanced Linux Sound Architecture (ALSA) library
|
Summary: The Advanced Linux Sound Architecture (ALSA) library
|
||||||
Name: alsa-lib
|
Name: alsa-lib
|
||||||
Version: %{version_alsa_lib}
|
Version: %{version_alsa_lib}
|
||||||
Release: 3%{?prever_dot}%{?dist}
|
Release: 4%{?prever_dot}%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.alsa-project.org/
|
URL: http://www.alsa-project.org/
|
||||||
|
|
||||||
@ -19,6 +19,7 @@ Source2: ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-%{version_alsa_t
|
|||||||
Source10: asound.conf
|
Source10: asound.conf
|
||||||
Source11: modprobe-dist-alsa.conf
|
Source11: modprobe-dist-alsa.conf
|
||||||
Source12: modprobe-dist-oss.conf
|
Source12: modprobe-dist-oss.conf
|
||||||
|
Source40: alsa-ucm-conf.patch
|
||||||
Patch0: alsa-git.patch
|
Patch0: alsa-git.patch
|
||||||
Patch1: alsa-lib-1.1.9-config.patch
|
Patch1: alsa-lib-1.1.9-config.patch
|
||||||
Patch2: alsa-lib-1.0.14-glibc-open.patch
|
Patch2: alsa-lib-1.0.14-glibc-open.patch
|
||||||
@ -111,6 +112,7 @@ mkdir -p %{buildroot}/%{_datadir}/alsa/ucm2
|
|||||||
|
|
||||||
# Unpack UCMs
|
# Unpack UCMs
|
||||||
tar xvjf %{SOURCE1} -C %{buildroot}/%{_datadir}/alsa ucm ucm2
|
tar xvjf %{SOURCE1} -C %{buildroot}/%{_datadir}/alsa ucm ucm2
|
||||||
|
patch -d %{buildroot}/%{_datadir}/alsa -p1 < %{SOURCE40}
|
||||||
|
|
||||||
# Create topology directory
|
# Create topology directory
|
||||||
mkdir -p %{buildroot}/%{_datadir}/alsa/topology
|
mkdir -p %{buildroot}/%{_datadir}/alsa/topology
|
||||||
@ -161,6 +163,9 @@ rm %{buildroot}/%{_includedir}/asoundlib.h
|
|||||||
%{_datadir}/alsa/topology
|
%{_datadir}/alsa/topology
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 9 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1.2-4
|
||||||
|
- Fixes for sof-hda-dsp UCM2 configuration
|
||||||
|
|
||||||
* Tue Dec 3 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1.2-3
|
* Tue Dec 3 2019 Jaroslav Kysela <perex@perex.cz> - 1.2.1.2-3
|
||||||
- Fixed more UCM2 related issues
|
- Fixed more UCM2 related issues
|
||||||
|
|
||||||
|
102
alsa-ucm-conf.patch
Normal file
102
alsa-ucm-conf.patch
Normal file
@ -0,0 +1,102 @@
|
|||||||
|
From 2882eb5085db58b60ff6dd0f61912d32ccbdf911 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
Date: Thu, 5 Dec 2019 17:46:53 +0100
|
||||||
|
Subject: [PATCH 1/3] sof-hda-dsp: Fix the Dmic0 CaptureMixerElem for v1.4.1
|
||||||
|
firmware
|
||||||
|
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
ucm2/sof-hda-dsp/HiFi.conf | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf
|
||||||
|
index f1c81a1..500cbae 100644
|
||||||
|
--- a/ucm2/sof-hda-dsp/HiFi.conf
|
||||||
|
+++ b/ucm2/sof-hda-dsp/HiFi.conf
|
||||||
|
@@ -162,7 +162,7 @@ SectionDevice."DigitalMic" {
|
||||||
|
Control "name='Dmic0 Capture Switch'"
|
||||||
|
}
|
||||||
|
True {
|
||||||
|
- CaptureMixerElem "Dmic0 Capture"
|
||||||
|
+ CaptureMixerElem "Dmic0"
|
||||||
|
CaptureVolume "Dmic0 Capture Volume"
|
||||||
|
CaptureSwitch "Dmic0 Capture Switch"
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
||||||
|
|
||||||
|
From adeb572487081f4f88318583d6eefb0ea1b61361 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
Date: Fri, 6 Dec 2019 11:12:39 +0100
|
||||||
|
Subject: [PATCH 2/3] sof-hda-dsp: Use more strict names according latest
|
||||||
|
use-case.h
|
||||||
|
|
||||||
|
Also remove ConflictinDevice section from the digital microphone.
|
||||||
|
Those paths are independent.
|
||||||
|
|
||||||
|
BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/7
|
||||||
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||||
|
---
|
||||||
|
ucm2/sof-hda-dsp/HiFi.conf | 15 ++++++---------
|
||||||
|
1 file changed, 6 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/ucm2/sof-hda-dsp/HiFi.conf b/ucm2/sof-hda-dsp/HiFi.conf
|
||||||
|
index 500cbae..5c7236d 100644
|
||||||
|
--- a/ucm2/sof-hda-dsp/HiFi.conf
|
||||||
|
+++ b/ucm2/sof-hda-dsp/HiFi.conf
|
||||||
|
@@ -6,7 +6,7 @@ SectionVerb {
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
-SectionDevice."Headphones" {
|
||||||
|
+SectionDevice."Headphones1" {
|
||||||
|
Comment "Headphones"
|
||||||
|
|
||||||
|
EnableSequence [
|
||||||
|
@@ -87,8 +87,9 @@ If.monomic {
|
||||||
|
Control "name='Input Source'"
|
||||||
|
ControlEnum "Headphone Mic"
|
||||||
|
}
|
||||||
|
+ After.SectionDevice "Mic"
|
||||||
|
True {
|
||||||
|
- SectionDevice."HeadphonesMic" {
|
||||||
|
+ SectionDevice."Headphones2" {
|
||||||
|
Comment "Headphones Stereo Microphone"
|
||||||
|
|
||||||
|
ConflictingDevice [
|
||||||
|
@@ -106,7 +107,7 @@ If.monomic {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- SectionDevice."HeadsetMic" {
|
||||||
|
+ SectionDevice."Headset" {
|
||||||
|
Comment "Headset Mono Microphone"
|
||||||
|
|
||||||
|
EnableSequence [
|
||||||
|
@@ -121,7 +122,7 @@ If.monomic {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
False {
|
||||||
|
- SectionDevice."HeadphonesMic" {
|
||||||
|
+ SectionDevice."Headphones2" {
|
||||||
|
Comment "Headphones Stereo Microphone"
|
||||||
|
|
||||||
|
Value {
|
||||||
|
@@ -133,13 +134,9 @@ If.monomic {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-SectionDevice."DigitalMic" {
|
||||||
|
+SectionDevice."Mic" {
|
||||||
|
Comment "Digital Microphone"
|
||||||
|
|
||||||
|
- ConflictingDevice [
|
||||||
|
- "HeadsetMic"
|
||||||
|
- ]
|
||||||
|
-
|
||||||
|
Value {
|
||||||
|
CapturePriority 100
|
||||||
|
CapturePCM "hw:${CardId},6"
|
||||||
|
--
|
||||||
|
2.20.1
|
Loading…
Reference in New Issue
Block a user