diff -Nru alsa-lib-1.1.3/debian/changelog alsa-lib-1.1.3/debian/changelog --- alsa-lib-1.1.3/debian/changelog 2018-12-19 12:25:25.000000000 +0800 +++ alsa-lib-1.1.3/debian/changelog 2020-01-15 15:33:08.000000000 +0800 @@ -1,3 +1,15 @@ +alsa-lib (1.1.3-5ubuntu0.3) bionic; urgency=medium + + * d/p/0018-add-ucm-for-sof-driver-LenovoX1-7th-and-Dell-cml.patch + - This patch is backported from the branch sof_ucm1 of the git repo + https://github.com/thesofproject/alsa-ucm-conf.git (f083700beda6). + After adding these ucm files, the alsa sof driver can work under + pulseaudio on Lenovo X1 variants and Dell cml and cnl dmic + machines. And that git repo is maintained by Intel audio team. + (LP: #1859754) + + -- Hui Wang Wed, 15 Jan 2020 15:33:08 +0800 + alsa-lib (1.1.3-5ubuntu0.2) bionic; urgency=medium * d/p/0014-conf-ucm-Add-a-UCM-profile-for-Dell-WD15-Dock-USB-au.patch diff -Nru alsa-lib-1.1.3/debian/patches/0018-add-ucm-for-sof-driver-LenovoX1-7th-and-Dell-cml.patch alsa-lib-1.1.3/debian/patches/0018-add-ucm-for-sof-driver-LenovoX1-7th-and-Dell-cml.patch --- alsa-lib-1.1.3/debian/patches/0018-add-ucm-for-sof-driver-LenovoX1-7th-and-Dell-cml.patch 1970-01-01 08:00:00.000000000 +0800 +++ alsa-lib-1.1.3/debian/patches/0018-add-ucm-for-sof-driver-LenovoX1-7th-and-Dell-cml.patch 2020-01-15 15:32:35.000000000 +0800 @@ -0,0 +1,868 @@ +Index: alsa-lib-1.1.3/configure.ac +=================================================================== +--- alsa-lib-1.1.3.orig/configure.ac ++++ alsa-lib-1.1.3/configure.ac +@@ -685,6 +685,11 @@ AC_OUTPUT(Makefile doc/Makefile doc/pict + src/conf/ucm/Manta-I2S/Makefile \ + src/conf/ucm/Manta-SPDIF/Makefile \ + src/conf/ucm/msm8974-taiko-mtp-snd-card/Makefile \ ++ src/conf/ucm/sof-skl_hda_card/Makefile \ ++ src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Makefile \ ++ src/conf/ucm/LENOVO-20QESITR05-ThinkPadX1Carbon7th-20QESITR05/Makefile \ ++ src/conf/ucm/LENOVO-20UB0SIT17-ThinkPadX1YogaGen5-20UB0SIT17/Makefile \ ++ src/conf/ucm/LENOVO-MFG_IN_GO-ThinkPad-MFG_IN_GO/Makefile \ + src/conf/topology/Makefile \ + src/conf/topology/broadwell/Makefile \ + modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \ +Index: alsa-lib-1.1.3/src/conf/ucm/Makefile.am +=================================================================== +--- alsa-lib-1.1.3.orig/src/conf/ucm/Makefile.am ++++ alsa-lib-1.1.3/src/conf/ucm/Makefile.am +@@ -1 +1 @@ +-SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan HDAudio-Lenovo-DualCodecs broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c Dell-WD15-Dock apq8064-tabla-snd-card Tuna tegra-rt5640 Manta-I2S Manta-SPDIF msm8974-taiko-mtp-snd-card ++SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan HDAudio-Lenovo-DualCodecs broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c Dell-WD15-Dock apq8064-tabla-snd-card Tuna tegra-rt5640 Manta-I2S Manta-SPDIF msm8974-taiko-mtp-snd-card sof-skl_hda_card LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC LENOVO-20QESITR05-ThinkPadX1Carbon7th-20QESITR05 LENOVO-20UB0SIT17-ThinkPadX1YogaGen5-20UB0SIT17 LENOVO-MFG_IN_GO-ThinkPad-MFG_IN_GO +Index: alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi1.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi1.conf +@@ -0,0 +1,35 @@ ++# Use case Configuration for skl-hda-card ++ ++SectionVerb { ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++} ++ ++SectionDevice."HDMI1" { ++ Comment "HDMI1/DP1 Output" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='IEC958 Playback Switch' on" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='IEC958 Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:sofsklhdacard,3" ++ PlaybackChannels "2" ++ JackControl "HDMI/DP,pcm=3 Jack" ++ PlaybackPriority "300" ++ } ++} ++ ++ +Index: alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi2.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi2.conf +@@ -0,0 +1,35 @@ ++# Use case Configuration for skl-hda-card ++ ++SectionVerb { ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++} ++ ++SectionDevice."HDMI2" { ++ Comment "HDMI2/DP2 Output" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='IEC958 Playback Switch',index=1 on" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='IEC958 Playback Switch',index=1 off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:sofsklhdacard,4" ++ PlaybackChannels "2" ++ JackControl "HDMI/DP,pcm=4 Jack" ++ PlaybackPriority "400" ++ } ++} ++ ++ +Index: alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi3.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi3.conf +@@ -0,0 +1,35 @@ ++# Use case Configuration for skl-hda-card ++ ++SectionVerb { ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++} ++ ++SectionDevice."HDMI3" { ++ Comment "HDMI3/DP3 Output" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='IEC958 Playback Switch',index=2 on" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='IEC958 Playback Switch',index=2 off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:sofsklhdacard,5" ++ PlaybackChannels "2" ++ JackControl "HDMI/DP,pcm=5 Jack" ++ PlaybackPriority "500" ++ } ++} ++ ++ +Index: alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf +@@ -0,0 +1,65 @@ ++# Use case Configuration for skl-hda-card ++ ++SectionVerb { ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++} ++ ++SectionDevice."Speaker" { ++ Comment "Speaker" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Speaker Playback Switch' on" ++ cset "name='Bass Speaker Playback Switch' on" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Speaker Playback Switch' off" ++ cset "name='Bass Speaker Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:sofsklhdacard,0" ++ PlaybackVolume "Master" ++ PlaybackSwitch "Master Playback Switch" ++ JackHWMute "Headphone" ++ PlaybackChannels "2" ++ PlaybackPriority "100" ++ } ++} ++ ++SectionDevice."Headphone" { ++ Comment "Headphone" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Headphone Playback Switch' on" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Headphone Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:sofsklhdacard,0" ++ PlaybackVolume "Master" ++ PlaybackSwitch "Master Playback Switch" ++ PlaybackChannels "2" ++ JackName "sof-skl_hda_card Headphone" ++ JackType "gpio" ++ JackSwitch "12" ++ JackControl "Headphone Jack" ++ PlaybackPriority "200" ++ } ++} ++ ++ +Index: alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC.conf +@@ -0,0 +1,35 @@ ++SectionUseCase."HiFi" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf" ++ Comment "Play HiFi Music" ++} ++ ++SectionUseCase."Hdmi1" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC.conf/Hdmi1.conf" ++ Comment "Play to Hdmi1" ++} ++ ++SectionUseCase."Hdmi2" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC.conf/Hdmi2.conf" ++ Comment "Play to Hdmi2" ++} ++ ++SectionUseCase."Hdmi3" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC.conf/Hdmi3.conf" ++ Comment "Play to Hdmi3" ++} ++ ++SectionDefaults [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Bass Speaker Playback Switch' off" ++ cset "name='Master Playback Switch' on" ++ cset "name='Master Playback Volume' 80" ++ cset "name='Capture Switch' on" ++ cset "name='Headphone Playback Volume' 80" ++ cset "name='Speaker Playback Volume' 80" ++ cset "name='Auto-Mute Mode' off" ++ cset "name='Capture Volume' 50" ++ cset "name='Headset Mic Boost Volume' 1" ++ cset "name='PGA2.0 2 Master Capture Volume' 60" ++ cset "name='PGA10.0 10 Master Capture Volume' 75" ++ cset "name='PGA11.0 11 Master Capture Volume' 75" ++] +Index: alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Makefile.am +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Makefile.am +@@ -0,0 +1,4 @@ ++alsaconfigdir = @ALSA_CONFIG_DIR@ ++ucmdir = $(alsaconfigdir)/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC ++ucm_DATA = Hdmi1.conf Hdmi2.conf Hdmi3.conf HiFi.conf Mics.conf LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC.conf ++EXTRA_DIST = $(ucm_DATA) +Index: alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Mics.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Mics.conf +@@ -0,0 +1,49 @@ ++SectionDevice."Headset Microphone" { ++ Comment "Headset Microphone" ++ ++ ConflictingDevice [ ++ "Digital Microphone" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ Value { ++ CapturePCM "hw:sofsklhdacard,0" ++ CaptureVolume "Capture" ++ CaptureSwitch "Capture Switch" ++ CaptureChannels "2" ++ JackName "sof-skl_hda_card Mic" ++ JackType "gpio" ++ JackSwitch "13" ++ JackControl "Mic Jack" ++ } ++} ++ ++SectionDevice."Dmic" { ++ Comment "Digital Microphone" ++ ++ ConflictingDevice [ ++ "Headset Microphone" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ Value { ++ CapturePCM "hw:sofsklhdacard,6" ++ CaptureVolume "Dmic0 Capture Volume" ++ CaptureSwitch "Dmic0 Capture Switch" ++ CaptureChannels "2" ++ } ++} +Index: alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QESITR05-ThinkPadX1Carbon7th-20QESITR05/LENOVO-20QESITR05-ThinkPadX1Carbon7th-20QESITR05.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QESITR05-ThinkPadX1Carbon7th-20QESITR05/LENOVO-20QESITR05-ThinkPadX1Carbon7th-20QESITR05.conf +@@ -0,0 +1,35 @@ ++SectionUseCase."HiFi" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf" ++ Comment "Play HiFi Music" ++} ++ ++SectionUseCase."Hdmi1" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi1.conf" ++ Comment "Play to Hdmi1" ++} ++ ++SectionUseCase."Hdmi2" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi2.conf" ++ Comment "Play to Hdmi2" ++} ++ ++SectionUseCase."Hdmi3" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi3.conf" ++ Comment "Play to Hdmi3" ++} ++ ++SectionDefaults [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Bass Speaker Playback Switch' off" ++ cset "name='Master Playback Switch' on" ++ cset "name='Master Playback Volume' 80" ++ cset "name='Capture Switch' on" ++ cset "name='Headphone Playback Volume' 80" ++ cset "name='Speaker Playback Volume' 80" ++ cset "name='Auto-Mute Mode' off" ++ cset "name='Capture Volume' 50" ++ cset "name='Headset Mic Boost Volume' 1" ++ cset "name='PGA2.0 2 Master Capture Volume' 60" ++ cset "name='PGA10.0 10 Master Capture Volume' 75" ++ cset "name='PGA11.0 11 Master Capture Volume' 75" ++] +Index: alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QESITR05-ThinkPadX1Carbon7th-20QESITR05/Makefile.am +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/LENOVO-20QESITR05-ThinkPadX1Carbon7th-20QESITR05/Makefile.am +@@ -0,0 +1,4 @@ ++alsaconfigdir = @ALSA_CONFIG_DIR@ ++ucmdir = $(alsaconfigdir)/ucm/LENOVO-20QESITR05-ThinkPadX1Carbon7th-20QESITR05 ++ucm_DATA = LENOVO-20QESITR05-ThinkPadX1Carbon7th-20QESITR05.conf ++EXTRA_DIST = $(ucm_DATA) +Index: alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/Hdmi1.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/Hdmi1.conf +@@ -0,0 +1,35 @@ ++# Use case Configuration for skl-hda-card ++ ++SectionVerb { ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++} ++ ++SectionDevice."HDMI1" { ++ Comment "HDMI1/DP1 Output" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='IEC958 Playback Switch' on" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='IEC958 Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:sofsklhdacard,3" ++ PlaybackChannels "2" ++ JackControl "HDMI/DP,pcm=3 Jack" ++ PlaybackPriority "300" ++ } ++} ++ ++ +Index: alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/Hdmi2.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/Hdmi2.conf +@@ -0,0 +1,35 @@ ++# Use case Configuration for skl-hda-card ++ ++SectionVerb { ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++} ++ ++SectionDevice."HDMI2" { ++ Comment "HDMI2/DP2 Output" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='IEC958 Playback Switch',index=1 on" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='IEC958 Playback Switch',index=1 off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:sofsklhdacard,4" ++ PlaybackChannels "2" ++ JackControl "HDMI/DP,pcm=4 Jack" ++ PlaybackPriority "400" ++ } ++} ++ ++ +Index: alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/Hdmi3.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/Hdmi3.conf +@@ -0,0 +1,35 @@ ++# Use case Configuration for skl-hda-card ++ ++SectionVerb { ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++} ++ ++SectionDevice."HDMI3" { ++ Comment "HDMI3/DP3 Output" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='IEC958 Playback Switch',index=2 on" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='IEC958 Playback Switch',index=2 off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:sofsklhdacard,5" ++ PlaybackChannels "2" ++ JackControl "HDMI/DP,pcm=5 Jack" ++ PlaybackPriority "500" ++ } ++} ++ ++ +Index: alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/HdmiHdac.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/HdmiHdac.conf +@@ -0,0 +1,78 @@ ++# Use case Configuration for skl-hda-card ++ ++SectionVerb { ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++} ++ ++SectionDevice."HDMI1" { ++ Comment "HDMI1/DP1 Output" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='hif5-0 Jack Switch' on" ++ cset "name='Pin5-Port0 Mux' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Pin5-Port0 Mux' 0" ++ cset "name='hif5-0 Jack Switch' off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:0,3" ++ PlaybackChannels "2" ++ JackControl "HDMI/DP, pcm=11 Jack" ++ } ++} ++ ++SectionDevice."HDMI2" { ++ Comment "HDMI2/DP2 Output" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='hif6-0 Jack Switch' on" ++ cset "name='Pin6-Port0 Mux' 2" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Pin6-Port0 Mux' 0" ++ cset "name='hif6-0 Jack Switch' off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:0,4" ++ PlaybackChannels "2" ++ JackControl "HDMI/DP, pcm=12 Jack" ++ } ++} ++ ++SectionDevice."HDMI3" { ++ Comment "HDMI3/DP3 Output" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='hif7-0 Jack Switch' on" ++ cset "name='Pin7-Port0 Mux' 3" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Pin7-Port0 Mux' 0" ++ cset "name='hif7-0 Jack Switch' off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:0,5" ++ PlaybackChannels "2" ++ JackControl "HDMI/DP, pcm=13 Jack" ++ } ++} +Index: alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/HiFi.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/HiFi.conf +@@ -0,0 +1,63 @@ ++# Use case Configuration for skl-hda-card ++ ++SectionVerb { ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++} ++ ++SectionDevice."Speaker" { ++ Comment "Speaker" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Speaker Playback Switch' on" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Speaker Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:sofsklhdacard,0" ++ PlaybackVolume "Master" ++ PlaybackSwitch "Master Playback Switch" ++ JackHWMute "Headphone" ++ PlaybackChannels "2" ++ PlaybackPriority "100" ++ } ++} ++ ++SectionDevice."Headphone" { ++ Comment "Headphone" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Headphone Playback Switch' on" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Headphone Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:sofsklhdacard,0" ++ PlaybackVolume "Master" ++ PlaybackSwitch "Master Playback Switch" ++ PlaybackChannels "2" ++ JackName "sof-skl_hda_card Headphone" ++ JackType "gpio" ++ JackSwitch "12" ++ JackControl "Headphone Mic Jack" ++ PlaybackPriority "200" ++ } ++} ++ ++ +Index: alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/Makefile.am +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/Makefile.am +@@ -0,0 +1,4 @@ ++alsaconfigdir = @ALSA_CONFIG_DIR@ ++ucmdir = $(alsaconfigdir)/ucm/sof-skl_hda_card ++ucm_DATA = Hdmi1.conf Hdmi2.conf Hdmi3.conf HdmiHdac.conf HiFi.conf Mics.conf sof-skl_hda_card.conf ++EXTRA_DIST = $(ucm_DATA) +Index: alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/Mics.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/Mics.conf +@@ -0,0 +1,81 @@ ++SectionDevice."Headset Microphone" { ++ Comment "Headset Microphone" ++ ++ ConflictingDevice [ ++ "Digital Microphone" ++ "Headphone Microphone" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Input Source' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ Value { ++ CapturePCM "hw:sofsklhdacard,0" ++ CaptureVolume "Capture" ++ CaptureSwitch "Capture Switch" ++ CaptureChannels "2" ++ JackName "sof-skl_hda_card Headphone" ++ JackType "gpio" ++ JackSwitch "12" ++ JackControl "Headphone Mic Jack" ++ } ++} ++ ++SectionDevice."Headphone Microphone" { ++ Comment "Headphone Microphone" ++ ++ ConflictingDevice [ ++ "Digital Microphone" ++ "Headset Microphone" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Input Source' 0" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ Value { ++ CapturePCM "hw:sofsklhdacard,0" ++ CaptureVolume "Capture" ++ CaptureSwitch "Capture Switch" ++ CaptureChannels "2" ++ JackName "sof-skl_hda_card Headphone" ++ JackType "gpio" ++ JackSwitch "12" ++ JackControl "Headphone Mic Jack" ++ } ++} ++ ++SectionDevice."Dmic" { ++ Comment "Digital Microphone" ++ ++ ConflictingDevice [ ++ "Headset Microphone" ++ "Headphone Microphone" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ Value { ++ CapturePCM "hw:sofsklhdacard,6" ++ CaptureVolume "Dmic0 Capture Volume" ++ CaptureSwitch "Dmic0 Capture Switch" ++ CaptureChannels "2" ++ } ++} +Index: alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/sof-skl_hda_card.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/sof-skl_hda_card/sof-skl_hda_card.conf +@@ -0,0 +1,34 @@ ++SectionUseCase."HiFi" { ++ File "HiFi.conf" ++ Comment "Play HiFi Music" ++} ++ ++SectionUseCase."Hdmi1" { ++ File "Hdmi1.conf" ++ Comment "Play to Hdmi1" ++} ++ ++SectionUseCase."Hdmi2" { ++ File "Hdmi2.conf" ++ Comment "Play to Hdmi2" ++} ++ ++SectionUseCase."Hdmi3" { ++ File "Hdmi3.conf" ++ Comment "Play to Hdmi3" ++} ++ ++SectionDefaults [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Master Playback Switch' on" ++ cset "name='Master Playback Volume' 80" ++ cset "name='Capture Switch' on" ++ cset "name='Headphone Playback Volume' 80" ++ cset "name='Speaker Playback Volume' 80" ++ cset "name='Auto-Mute Mode' off" ++ cset "name='Capture Volume' 50" ++ cset "name='Headset Mic Boost Volume' 1" ++ cset "name='PGA2.0 2 Master Capture Volume' 60" ++ cset "name='PGA10.0 10 Master Capture Volume' 75" ++ cset "name='PGA11.0 11 Master Capture Volume' 75" ++] +Index: alsa-lib-1.1.3/src/conf/ucm/LENOVO-20UB0SIT17-ThinkPadX1YogaGen5-20UB0SIT17/LENOVO-20UB0SIT17-ThinkPadX1YogaGen5-20UB0SIT17.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/LENOVO-20UB0SIT17-ThinkPadX1YogaGen5-20UB0SIT17/LENOVO-20UB0SIT17-ThinkPadX1YogaGen5-20UB0SIT17.conf +@@ -0,0 +1,35 @@ ++SectionUseCase."HiFi" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf" ++ Comment "Play HiFi Music" ++} ++ ++SectionUseCase."Hdmi1" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi1.conf" ++ Comment "Play to Hdmi1" ++} ++ ++SectionUseCase."Hdmi2" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi2.conf" ++ Comment "Play to Hdmi2" ++} ++ ++SectionUseCase."Hdmi3" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi3.conf" ++ Comment "Play to Hdmi3" ++} ++ ++SectionDefaults [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Bass Speaker Playback Switch' off" ++ cset "name='Master Playback Switch' on" ++ cset "name='Master Playback Volume' 80" ++ cset "name='Capture Switch' on" ++ cset "name='Headphone Playback Volume' 80" ++ cset "name='Speaker Playback Volume' 80" ++ cset "name='Auto-Mute Mode' off" ++ cset "name='Capture Volume' 50" ++ cset "name='Headset Mic Boost Volume' 1" ++ cset "name='PGA2.0 2 Master Capture Volume' 60" ++ cset "name='PGA10.0 10 Master Capture Volume' 75" ++ cset "name='PGA11.0 11 Master Capture Volume' 75" ++] +Index: alsa-lib-1.1.3/src/conf/ucm/LENOVO-20UB0SIT17-ThinkPadX1YogaGen5-20UB0SIT17/Makefile.am +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/LENOVO-20UB0SIT17-ThinkPadX1YogaGen5-20UB0SIT17/Makefile.am +@@ -0,0 +1,4 @@ ++alsaconfigdir = @ALSA_CONFIG_DIR@ ++ucmdir = $(alsaconfigdir)/ucm/LENOVO-20UB0SIT17-ThinkPadX1YogaGen5-20UB0SIT17 ++ucm_DATA = LENOVO-20UB0SIT17-ThinkPadX1YogaGen5-20UB0SIT17.conf ++EXTRA_DIST = $(ucm_DATA) +Index: alsa-lib-1.1.3/src/conf/ucm/LENOVO-MFG_IN_GO-ThinkPad-MFG_IN_GO/LENOVO-MFG_IN_GO-ThinkPad-MFG_IN_GO.conf +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/LENOVO-MFG_IN_GO-ThinkPad-MFG_IN_GO/LENOVO-MFG_IN_GO-ThinkPad-MFG_IN_GO.conf +@@ -0,0 +1,35 @@ ++SectionUseCase."HiFi" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/HiFi.conf" ++ Comment "Play HiFi Music" ++} ++ ++SectionUseCase."Hdmi1" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi1.conf" ++ Comment "Play to Hdmi1" ++} ++ ++SectionUseCase."Hdmi2" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi2.conf" ++ Comment "Play to Hdmi2" ++} ++ ++SectionUseCase."Hdmi3" { ++ File "../LENOVO-20QE000VMC-ThinkPadX1Carbon7th-20QE000VMC/Hdmi3.conf" ++ Comment "Play to Hdmi3" ++} ++ ++SectionDefaults [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Bass Speaker Playback Switch' off" ++ cset "name='Master Playback Switch' on" ++ cset "name='Master Playback Volume' 80" ++ cset "name='Capture Switch' on" ++ cset "name='Headphone Playback Volume' 80" ++ cset "name='Speaker Playback Volume' 80" ++ cset "name='Auto-Mute Mode' off" ++ cset "name='Capture Volume' 50" ++ cset "name='Headset Mic Boost Volume' 1" ++ cset "name='PGA2.0 2 Master Capture Volume' 60" ++ cset "name='PGA10.0 10 Master Capture Volume' 75" ++ cset "name='PGA11.0 11 Master Capture Volume' 75" ++] +Index: alsa-lib-1.1.3/src/conf/ucm/LENOVO-MFG_IN_GO-ThinkPad-MFG_IN_GO/Makefile.am +=================================================================== +--- /dev/null ++++ alsa-lib-1.1.3/src/conf/ucm/LENOVO-MFG_IN_GO-ThinkPad-MFG_IN_GO/Makefile.am +@@ -0,0 +1,4 @@ ++alsaconfigdir = @ALSA_CONFIG_DIR@ ++ucmdir = $(alsaconfigdir)/ucm/LENOVO-MFG_IN_GO-ThinkPad-MFG_IN_GO ++ucm_DATA = LENOVO-MFG_IN_GO-ThinkPad-MFG_IN_GO.conf ++EXTRA_DIST = $(ucm_DATA) diff -Nru alsa-lib-1.1.3/debian/patches/series alsa-lib-1.1.3/debian/patches/series --- alsa-lib-1.1.3/debian/patches/series 2018-12-19 12:25:25.000000000 +0800 +++ alsa-lib-1.1.3/debian/patches/series 2020-01-15 15:32:53.000000000 +0800 @@ -15,3 +15,4 @@ 0015-conf-ucm-Dell-WD15-Dock-Fix-incorrect-device-names.patch 0016-conf-USB-Audio-Add-Dell-WD19-Dock-in-the-IEC958-blac.patch 0017-configure-Fix-forgotten-ucm-entry.patch +0018-add-ucm-for-sof-driver-LenovoX1-7th-and-Dell-cml.patch