diff --git a/0001-sof-hda-dsp-Fix-the-Dmic0-CaptureMixerElem-for-v1.4..patch b/0001-sof-hda-dsp-Fix-the-Dmic0-CaptureMixerElem-for-v1.4..patch new file mode 100644 index 0000000..14f2956 --- /dev/null +++ b/0001-sof-hda-dsp-Fix-the-Dmic0-CaptureMixerElem-for-v1.4..patch @@ -0,0 +1,27 @@ +From 2882eb5085db58b60ff6dd0f61912d32ccbdf911 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Thu, 5 Dec 2019 17:46:53 +0100 +Subject: [PATCH 1/6] sof-hda-dsp: Fix the Dmic0 CaptureMixerElem for v1.4.1 + firmware + +Signed-off-by: Jaroslav Kysela +--- + 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 f1c81a1b4f53..500cbae82a43 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.16.4 + diff --git a/0002-sof-hda-dsp-Use-more-strict-names-according-latest-u.patch b/0002-sof-hda-dsp-Use-more-strict-names-according-latest-u.patch new file mode 100644 index 0000000..5510a65 --- /dev/null +++ b/0002-sof-hda-dsp-Use-more-strict-names-according-latest-u.patch @@ -0,0 +1,75 @@ +From adeb572487081f4f88318583d6eefb0ea1b61361 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Fri, 6 Dec 2019 11:12:39 +0100 +Subject: [PATCH 2/6] 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 +--- + 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 500cbae82a43..5c7236d7bd02 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.16.4 + diff --git a/0003-README-remove-topologies-note.patch b/0003-README-remove-topologies-note.patch new file mode 100644 index 0000000..d93f462 --- /dev/null +++ b/0003-README-remove-topologies-note.patch @@ -0,0 +1,20 @@ +From 42b15d5d4adc8b462ed004811a2ed7078b2ef2b3 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Fri, 6 Dec 2019 11:15:37 +0100 +Subject: [PATCH 3/6] README: remove topologies note + +--- + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/README.md b/README.md +index 635d5e9de1d4..9c4e3503148e 100644 +--- a/README.md ++++ b/README.md +@@ -1,2 +1,2 @@ + # alsa-ucm-conf +-ALSA Use Case Manager configuration (and topologies) ++ALSA Use Case Manager configuration +-- +2.16.4 + diff --git a/0004-bytcht-es8316-Fix-missing-including-of-HeadPhones.co.patch b/0004-bytcht-es8316-Fix-missing-including-of-HeadPhones.co.patch new file mode 100644 index 0000000..069eaf3 --- /dev/null +++ b/0004-bytcht-es8316-Fix-missing-including-of-HeadPhones.co.patch @@ -0,0 +1,51 @@ +From e852e235102b6132e7c873c2ff00bf3e01237af0 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 6 Jan 2020 14:11:59 +0100 +Subject: [PATCH 4/6] bytcht-es8316: Fix missing including of HeadPhones.conf + after ucm2 conversion + +The conversion to ucm2 format missed adding an include for: + +codecs/es8316/HeadPhones.conf + +Leading to no sound on the headphones output, this commit adds the missing +include fixing this. + +Cc: youling 257 +Reported-by: youling 257 +Signed-off-by: Hans de Goede +Signed-off-by: Jaroslav Kysela +--- + ucm2/bytcht-es8316/HiFi-Components.conf | 2 ++ + ucm2/bytcht-es8316/HiFi-LongName.conf | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/ucm2/bytcht-es8316/HiFi-Components.conf b/ucm2/bytcht-es8316/HiFi-Components.conf +index 314d35517c01..c40bd491bac9 100644 +--- a/ucm2/bytcht-es8316/HiFi-Components.conf ++++ b/ucm2/bytcht-es8316/HiFi-Components.conf +@@ -20,6 +20,8 @@ If.mono { + } + } + ++ ++ + If.in1 { + Condition { + Type String +diff --git a/ucm2/bytcht-es8316/HiFi-LongName.conf b/ucm2/bytcht-es8316/HiFi-LongName.conf +index ea7d1c35c58a..03cf17b54cda 100644 +--- a/ucm2/bytcht-es8316/HiFi-LongName.conf ++++ b/ucm2/bytcht-es8316/HiFi-LongName.conf +@@ -20,6 +20,8 @@ If.mono { + } + } + ++ ++ + If.in1 { + Condition { + Type String +-- +2.16.4 + diff --git a/0005-ucm2-fix-the-verb-path-in-chtrt5645-chtrt5645-dmic2..patch b/0005-ucm2-fix-the-verb-path-in-chtrt5645-chtrt5645-dmic2..patch new file mode 100644 index 0000000..c08f9f8 --- /dev/null +++ b/0005-ucm2-fix-the-verb-path-in-chtrt5645-chtrt5645-dmic2..patch @@ -0,0 +1,25 @@ +From 74f2a0f0884df7b9f2d08d07456a3bc37d1a512e Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 13 Jan 2020 13:36:55 +0100 +Subject: [PATCH 5/6] ucm2: fix the verb path in chtrt5645/chtrt5645-dmic2.conf + +Signed-off-by: Jaroslav Kysela +--- + ucm2/chtrt5645/chtrt5645-dmic2.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ucm2/chtrt5645/chtrt5645-dmic2.conf b/ucm2/chtrt5645/chtrt5645-dmic2.conf +index 9bbebfaa66cf..2ea095ca5261 100644 +--- a/ucm2/chtrt5645/chtrt5645-dmic2.conf ++++ b/ucm2/chtrt5645/chtrt5645-dmic2.conf +@@ -1,6 +1,6 @@ + Syntax 2 + Comment "Intel SoC Audio Device" + SectionUseCase."HiFi" { +- File "../LENOVO-80XF-LenovoMIIX320_10ICR-LNVNB161216/HiFi.conf" ++ File "HiFi-dmic2.conf" + Comment "Default" + } +-- +2.16.4 + diff --git a/0006-broadwell-rt286-add-support-for-hardware-volume-conf.patch b/0006-broadwell-rt286-add-support-for-hardware-volume-conf.patch new file mode 100644 index 0000000..c5ed13c --- /dev/null +++ b/0006-broadwell-rt286-add-support-for-hardware-volume-conf.patch @@ -0,0 +1,172 @@ +From be86627a9f4179979d208943bb497b10dfc679cb Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 10 Dec 2019 17:08:37 +0100 +Subject: [PATCH 6/6] broadwell-rt286: add support for hardware volume, + conformance fixes + +Signed-off-by: Jaroslav Kysela +--- + ucm2/broadwell-rt286/HiFi.conf | 90 ++++++++++++++++++++---------------------- + 1 file changed, 43 insertions(+), 47 deletions(-) + +diff --git a/ucm2/broadwell-rt286/HiFi.conf b/ucm2/broadwell-rt286/HiFi.conf +index 6cf31e75ace4..e766250dfac8 100644 +--- a/ucm2/broadwell-rt286/HiFi.conf ++++ b/ucm2/broadwell-rt286/HiFi.conf +@@ -1,13 +1,31 @@ + # Use case Configuration for Nexus 7 + # Adapted to Ubuntu Touch by David Henningsson + +-SectionVerb { ++SectionDevice."Speaker" { ++ Comment "Speaker playback" ++ ++ ConflictingDevice [ ++ "Headphones" ++ ] ++ ++ EnableSequence [ ++ cset "name='SPO Switch' on" ++ cset "name='Speaker Playback Switch' on" ++ cset "name='Speaker Switch' on" ++ ] ++ ++ DisableSequence [ ++ cset "name='Speaker Switch' off" ++ cset "name='Speaker Playback Switch' off" ++ cset "name='SPO Switch' 0" ++ ] + +- # ALSA PCM + Value { +- # ALSA PCM device for HiFi ++ Priority 100 + PlaybackPCM "hw:${CardId}" +- CapturePCM "hw:${CardId}" ++ PlaybackChannels 2 ++ PlaybackMixerElem "DAC0" ++ PlaybackMasterElem "Master" + } + } + +@@ -19,11 +37,9 @@ SectionDevice."Headphones" { + ] + + EnableSequence [ +- cset "name='Master Playback Volume' 30" + cset "name='HPO L Switch' on" + cset "name='HPO R Switch' on" + cset "name='Headphone Jack Switch' on" +- cset "name='DAC0 Playback Volume' 100" + ] + + DisableSequence [ +@@ -33,36 +49,38 @@ SectionDevice."Headphones" { + ] + + Value { +- PlaybackChannels "2" ++ Priority 200 ++ PlaybackPCM "hw:${CardId}" ++ PlaybackChannels 2 ++ PlaybackMixerElem "DAC0" ++ PlaybackMasterElem "Master" + JackDev "rt286-jack" + JackControl "Headphone Jack" + JackHWMute "Speaker" + } + } + +-SectionDevice."Speaker" { +- Comment "Speaker playback" ++SectionDevice."Mic" { ++ Comment "Microphone" + + ConflictingDevice [ +- "Headphones" ++ "Handset" + ] + + EnableSequence [ +- cset "name='Master Playback Volume' 30" +- cset "name='DAC0 Playback Volume' 127" +- cset "name='SPO Switch' on" +- cset "name='Speaker Playback Switch' on" +- cset "name='Speaker Switch' on" ++ cset "name='ADC 0 Mux' 2" + ] + + DisableSequence [ +- cset "name='Speaker Switch' off" +- cset "name='Speaker Playback Switch' off" +- cset "name='SPO Switch' 0" ++ cset "name='ADC0 Capture Switch' off" + ] + + Value { +- PlaybackChannels "2" ++ Priority 100 ++ CapturePCM "hw:${CardId}" ++ CaptureChannels "2" ++ CaptureMixerElem "Mic" ++ CaptureMasterElem "ADC0" + } + } + +@@ -70,14 +88,11 @@ SectionDevice."Handset" { + Comment "Handset Microphone" + + ConflictingDevice [ +- "Mainmic" ++ "Mic" + ] + + EnableSequence [ +- cset "name='Mic Capture Volume' 28" + cset "name='ADC 0 Mux' 0" +- cset "name='ADC0 Capture Switch' on" +- cset "name='ADC0 Capture Volume' 127" + cset "name='AMIC Volume' 1" + ] + +@@ -86,32 +101,13 @@ SectionDevice."Handset" { + ] + + Value { ++ Priority 200 ++ CapturePCM "hw:${CardId}" + CaptureChannels "2" ++ CaptureMixerElem "Mic" ++ CaptureMasterElem "ADC0" + JackDev "rt286-jack" + JackControl "Mic Jack" +- JackHWMute "Mainmic" +- } +-} +- +-SectionDevice."Mainmic" { +- Comment "Main Microphone" +- +- ConflictingDevice [ +- "Handset" +- ] +- +- EnableSequence [ +- cset "name='Mic Capture Volume' 30" +- cset "name='ADC 0 Mux' 2" +- cset "name='ADC0 Capture Switch' on" +- cset "name='ADC0 Capture Volume' 127" +- ] +- +- DisableSequence [ +- cset "name='ADC0 Capture Switch' off" +- ] +- +- Value { +- CaptureChannels "2" ++ JackHWMute "Mic" + } + } +-- +2.16.4 + diff --git a/alsa-ucm-conf.changes b/alsa-ucm-conf.changes index 27b18ac..93596c0 100644 --- a/alsa-ucm-conf.changes +++ b/alsa-ucm-conf.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Jan 21 15:45:15 CET 2020 - tiwai@suse.de + +- Backport upstream fixes: + fixes / corrections for sof-hda-dsp, es8316, chtrt5645 and + broadwell-rt286: + 0001-sof-hda-dsp-Fix-the-Dmic0-CaptureMixerElem-for-v1.4..patch + 0002-sof-hda-dsp-Use-more-strict-names-according-latest-u.patch + 0003-README-remove-topologies-note.patch + 0004-bytcht-es8316-Fix-missing-including-of-HeadPhones.co.patch + 0005-ucm2-fix-the-verb-path-in-chtrt5645-chtrt5645-dmic2..patch + 0006-broadwell-rt286-add-support-for-hardware-volume-conf.patch + ------------------------------------------------------------------- Fri Nov 29 20:45:11 CET 2019 - tiwai@suse.de diff --git a/alsa-ucm-conf.spec b/alsa-ucm-conf.spec index 971aeef..62a6670 100644 --- a/alsa-ucm-conf.spec +++ b/alsa-ucm-conf.spec @@ -1,7 +1,7 @@ # # spec file for package alsa-ucm-conf # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: alsa-ucm-conf Version: 1.2.1.2 Release: 0 @@ -22,6 +23,12 @@ 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-hda-dsp-Fix-the-Dmic0-CaptureMixerElem-for-v1.4..patch +Patch2: 0002-sof-hda-dsp-Use-more-strict-names-according-latest-u.patch +Patch3: 0003-README-remove-topologies-note.patch +Patch4: 0004-bytcht-es8316-Fix-missing-including-of-HeadPhones.co.patch +Patch5: 0005-ucm2-fix-the-verb-path-in-chtrt5645-chtrt5645-dmic2..patch +Patch6: 0006-broadwell-rt286-add-support-for-hardware-volume-conf.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -30,6 +37,12 @@ This package contains the profiles files for ALSA UCM (Use Case Manager). %prep %setup -q -c -a0 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build