Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package alsa-ucm-conf for openSUSE:Factory checked in at 2024-06-14 18:57:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-ucm-conf (Old) and /work/SRC/openSUSE:Factory/.alsa-ucm-conf.new.19518 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-ucm-conf" Fri Jun 14 18:57:46 2024 rev:30 rq:1180722 version:1.2.12 Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-ucm-conf/alsa-ucm-conf.changes 2024-02-04 19:07:13.480334339 +0100 +++ /work/SRC/openSUSE:Factory/.alsa-ucm-conf.new.19518/alsa-ucm-conf.changes 2024-06-14 18:57:56.698568396 +0200 @@ -1,0 +2,8 @@ +Thu Jun 13 14:57:35 UTC 2024 - Takashi Iwai <ti...@suse.com> + +- Update to version 1.2.12: + * Various updates for codecs, soundwire and SOF devices + For details, see: + https://www.alsa-project.org/wiki/Changes_v1.2.11_v1.2.12#alsa-ucm-conf + +------------------------------------------------------------------- Old: ---- alsa-ucm-conf-1.2.11.tar.bz2 alsa-ucm-conf-1.2.11.tar.bz2.sig New: ---- alsa-ucm-conf-1.2.12.tar.bz2 alsa-ucm-conf-1.2.12.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-ucm-conf.spec ++++++ --- /var/tmp/diff_new_pack.HkEr6m/_old 2024-06-14 18:57:57.338591480 +0200 +++ /var/tmp/diff_new_pack.HkEr6m/_new 2024-06-14 18:57:57.338591480 +0200 @@ -17,7 +17,7 @@ Name: alsa-ucm-conf -Version: 1.2.11 +Version: 1.2.12 Release: 0 Summary: ALSA UCM Profiles License: BSD-3-Clause ++++++ alsa-ucm-conf-1.2.11.tar.bz2 -> alsa-ucm-conf-1.2.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf new/alsa-ucm-conf-1.2.12/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf --- old/alsa-ucm-conf-1.2.11/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/Intel/sof-hda-dsp/HiFi-sof.conf 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,123 @@ +# Control audio processing in SOF + +# File paths for controlling SOF processing + +If.SOFIPCVer { + Condition { + Type ControlExists + Control "name='Post Mixer Analog Playback IIR Eq bytes'" + } + True.Define { + SOFIPCVer "ipc4" + PostMixerAnalogPlaybackIIRBytes "Post Mixer Analog Playback IIR Eq bytes" + PostMixerAnalogPlaybackFIRBytes "Post Mixer Analog Playback FIR Eq bytes" + PostMixerAnalogPlaybackDRCBytes "Post Mixer Analog Playback DRC bytes" + PostMixerAnalogPlaybackDRCSwitch "Post Mixer Analog Playback DRC switch" + } + False.Define { + SOFIPCVer "ipc3" + PostMixerAnalogPlaybackIIRBytes "EQIIR1.0 eqiir_coef_1" + PostMixerAnalogPlaybackFIRBytes "EQFIR1.0 eqfir_coef_1" + PostMixerAnalogPlaybackDRCBytes "not available" + PostMixerAnalogPlaybackDRCSwitch "not available" + } +} + +If.SOFPath { + Condition { Type AlwaysTrue } + True.Define { + BlobPath "${ConfTopDir}/blobs/sof/${var:SOFIPCVer}" + SpeakerIirBlob "${var:BlobPath}/eq_iir/highpass_100hz_0db_48khz.blob" + SpeakerFirBlob "${var:BlobPath}/eq_fir/pass.blob" + SpeakerDrcBlob "${var:BlobPath}/drc/speaker_default.blob" + HeadphoneIirBlob "${var:BlobPath}/eq_iir/pass.blob" + HeadphoneFirBlob "${var:BlobPath}/eq_fir/pass.blob" + HeadphoneDrcBlob "${var:BlobPath}/drc/passthrough.blob" + } +} + +Define.ConfPathFromDMI "${sys:devices/virtual/dmi/id/sys_vendor}/${sys:devices/virtual/dmi/id/product_name}.conf" +Define.SOFProductConfig "/blobs/sof/product_configs/${var:ConfPathFromDMI}" +Define.SOFConfFullPath "${ConfTopDir}${var:SOFProductConfig}" +Define.SOFUserConfig "/blobs/sof/user_configs/${var:ConfPathFromDMI}" +Define.SOFUserConfFullPath "${ConfTopDir}${var:SOFUserConfig}" + +If.HasUserConfig { + Condition { + Type Path + Mode read + Path "${var:SOFUserConfFullPath}" + } + True { + Include.product-config.File "${var:SOFUserConfig}" + } + False.If.HasProductConfig { + Condition { + Type Path + Mode read + Path "${var:SOFConfFullPath}" + } + True { + Include.product-config.File "${var:SOFProductConfig}" + } + } +} + +# Redefine headphone control FOR SOF. This is same as Headphone in HDA/HiFi-analog.conf +# but adds DRC and EQ controls. + +DefineMacro.SofControl { + Define.EndpointDrcVar "${var:__endpoint}DrcBlob" + Define.EndpointIirVar "${var:__endpoint}IirBlob" + Define.EndpointFirVar "${var:__endpoint}FirBlob" + Define.EndpointDrcBlob "${var:$EndpointDrcVar}" + Define.EndpointIirBlob "${var:$EndpointIirVar}" + Define.EndpointFirBlob "${var:$EndpointFirVar}" + + If.endpoint_with_drc { + Condition { + Type ControlExists + Control "name='${var:PostMixerAnalogPlaybackDRCSwitch}'" + } + True { + EnableSequence [ + # For debug uncomment below the echo command to see what blobs are applied + #shell "/bin/echo '${var:__endpoint} ${var:EndpointIirBlob} ${var:EndpointFirBlob} ${var:EndpointDrcBlob}' >> /tmp/alsa-ucm.txt" + cset "name='${var:PostMixerAnalogPlaybackDRCSwitch}' ${var:__drcswitch}" + cset-tlv "name='${var:PostMixerAnalogPlaybackDRCBytes}' ${var:EndpointDrcBlob}" + cset-tlv "name='${var:PostMixerAnalogPlaybackIIRBytes}' ${var:EndpointIirBlob}" + cset-tlv "name='${var:PostMixerAnalogPlaybackFIRBytes}' ${var:EndpointFirBlob}" + ] + } + False.If.endpoint_with_eq { + Condition { + Type ControlExists + Control "name='${var:PostMixerAnalogPlaybackFIRBytes}'" + } + True { + EnableSequence [ + # For debug uncomment below the echo command to see what blobs are applied + #shell "/bin/echo '${var:__endpoint} ${var:EndpointIirBlob} ${var:EndpointFirBlob}' >> /tmp/alsa-ucm.txt" + cset-tlv "name='${var:PostMixerAnalogPlaybackIIRBytes}' ${var:EndpointIirBlob}" + cset-tlv "name='${var:PostMixerAnalogPlaybackFIRBytes}' ${var:EndpointFirBlob}" + ] + } + } + } +} + +# Merge this to Headpones subtree in HDA/HiFi-analog.conf +SectionDevice."Headphones" { + Macro.headphone.SofControl "endpoint=Headphone drcswitch=off" +} + +# Merge this to Speaker subtree in HDA/HiFi-analog.conf +If.spk { + Condition { + Type ControlExists + Control "name='Speaker Playback Switch'" + } + True.SectionDevice."Speaker" { + Macro.speaker.SofControl "endpoint=Speaker drcswitch=on" + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/Intel/sof-hda-dsp/HiFi.conf new/alsa-ucm-conf-1.2.12/ucm2/Intel/sof-hda-dsp/HiFi.conf --- old/alsa-ucm-conf-1.2.11/ucm2/Intel/sof-hda-dsp/HiFi.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/Intel/sof-hda-dsp/HiFi.conf 2024-06-10 14:13:03.000000000 +0200 @@ -10,6 +10,8 @@ Include.hda-analog.File "/HDA/HiFi-analog.conf" +Include.sof-analog.File "HiFi-sof.conf" + If.dmic { Condition { Type String diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf new/alsa-ucm-conf-1.2.12/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf --- old/alsa-ucm-conf-1.2.11/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/Intel/sof-hda-dsp/sof-hda-dsp.conf 2024-06-10 14:13:03.000000000 +0200 @@ -1,10 +1,20 @@ Syntax 6 -Define.DeviceMic "Mic" -Define.DeviceDmic "" - Include.card-init.File "/lib/card-init.conf" +Define { + DeviceMic "Mic" + DeviceDmic "" + Iec61937Pcms1 "" +} + +DefineRegex { + Iec61937Pcms { + Regex "iec61937-pcm:(([0-9]+(,))*[0-9]+)" + String "${CardComponents}" + } +} + If.devdmic { Condition { Type String @@ -115,3 +125,41 @@ cset "name='Capture Switch' on" ] } + +Include.hdmi-pcm.File "/common/pcm/hdmi.conf" + +If.Hdmi3-iec61937 { + Condition { + Type RegexMatch + Regex "((^|,)[3](,|$))" + String "${var:Iec61937Pcms1}" + } + True.Macro.hdmi3.HdmiPCM { Device 3 Index 0 } +} + +If.Hdmi4-iec61937 { + Condition { + Type RegexMatch + Regex "((^|,)[4](,|$))" + String "${var:Iec61937Pcms1}" + } + True.Macro.hdmi4.HdmiPCM { Device 4 Index 1 } +} + +If.Hdmi5-iec61937 { + Condition { + Type RegexMatch + Regex "((^|,)[5](,|$))" + String "${var:Iec61937Pcms1}" + } + True.Macro.hdmi5.HdmiPCM { Device 5 Index 2 } +} + +If.HdmiIec61937 { + Condition { + Type RegexMatch + Regex "((^|,)[345](,|$))" + String "${var:Iec61937Pcms1}" + } + True.Macro.save_hdmi_cfg.HdmiPCMSave { Name "42-sof-hdmi" } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/MediaTek/mt8195-sof/mt6359-rt1019-rt5682/HiFi.conf new/alsa-ucm-conf-1.2.12/ucm2/MediaTek/mt8195-sof/mt6359-rt1019-rt5682/HiFi.conf --- old/alsa-ucm-conf-1.2.11/ucm2/MediaTek/mt8195-sof/mt6359-rt1019-rt5682/HiFi.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/MediaTek/mt8195-sof/mt6359-rt1019-rt5682/HiFi.conf 2024-06-10 14:13:03.000000000 +0200 @@ -33,13 +33,27 @@ EnableSequence [ cset "name='Headphone Switch' on" - cset "name='HPOL Playback Switch' 1" - cset "name='HPOR Playback Switch' 1" ] + If.is_rt5682i_hp { + Condition { + Type ControlExists + Control "name='HPOL Playback Switch'" + } + True { + EnableSequence [ + cset "name='HPOL Playback Switch' 1" + cset "name='HPOR Playback Switch' 1" + ] + + DisableSequence [ + cset "name='HPOL Playback Switch' 0" + cset "name='HPOR Playback Switch' 0" + ] + } + } + DisableSequence [ - cset "name='HPOL Playback Switch' 0" - cset "name='HPOR Playback Switch' 0" cset "name='Headphone Switch' off" ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/MediaTek/mt8195-sof/mt6359-rt1019-rt5682/init.conf new/alsa-ucm-conf-1.2.12/ucm2/MediaTek/mt8195-sof/mt6359-rt1019-rt5682/init.conf --- old/alsa-ucm-conf-1.2.11/ucm2/MediaTek/mt8195-sof/mt6359-rt1019-rt5682/init.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/MediaTek/mt8195-sof/mt6359-rt1019-rt5682/init.conf 2024-06-10 14:13:03.000000000 +0200 @@ -1,9 +1,20 @@ -# rt1019-rt5682 specific boot sequence +# rt1019-rt5682i/s specific boot sequence + +If.is_rt5682i { + # We can safely assume that both L/R exist if L does. + Condition { + Type ControlExists + Control "name='DAC L Mux" + } + True.BootSequence [ + cset "name='DAC L Mux' IF1" + cset "name='DAC R Mux' IF1" + ] +} + BootSequence [ cset "name='Stereo1 DAC MIXL DAC L1 Switch' 1" cset "name='Stereo1 DAC MIXR DAC R1 Switch' 1" - cset "name='DAC L Mux' IF1" - cset "name='DAC R Mux' IF1" cset "name='IF1 01 ADC Swap Mux' 2" cset "name='CBJ Boost Volume' 3" cset "name='Stereo1 ADC L Mux' 'ADC1 L'" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/Qualcomm/sc7180/adau7002-max98357a/HiFi.conf new/alsa-ucm-conf-1.2.12/ucm2/Qualcomm/sc7180/adau7002-max98357a/HiFi.conf --- old/alsa-ucm-conf-1.2.11/ucm2/Qualcomm/sc7180/adau7002-max98357a/HiFi.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/Qualcomm/sc7180/adau7002-max98357a/HiFi.conf 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,27 @@ +# Use case configuration for ADAU7002+MAX98357A on SC7180 + +SectionDevice."Speaker" { + Comment "Speakers" + Value { + PlaybackPCM "hw:${CardId},1" + PlaybackChannels 2 + PlaybackRate 48000 + PlaybackPriority 100 + } +} + +SectionDevice."Mic" { + Comment "Internal Mic" + Value { + CapturePCM "hw:${CardId},0" + CapturePriority 100 + } +} + +#SectionDevice."HDMI" { +# Comment "HDMI Out" +# Value { +# PlaybackPCM "hw:${CardId},2" +# JackControl "HDMI Jack" +# } +#} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/Qualcomm/sc7180/adau7002-max98357a/sc7180-adau7002-max98357a.conf new/alsa-ucm-conf-1.2.12/ucm2/Qualcomm/sc7180/adau7002-max98357a/sc7180-adau7002-max98357a.conf --- old/alsa-ucm-conf-1.2.11/ucm2/Qualcomm/sc7180/adau7002-max98357a/sc7180-adau7002-max98357a.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/Qualcomm/sc7180/adau7002-max98357a/sc7180-adau7002-max98357a.conf 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,10 @@ +Comment "SC7180 ADAU7002 MAX98357A single microphone sound card" +Syntax 4 + +SectionUseCase."HiFi" { + File "/Qualcomm/sc7180/adau7002-max98357a/HiFi.conf" + Comment "Default" +} + +Include.card-init.File "/lib/card-init.conf" +Include.ctl-remap.File "/lib/ctl-remap.conf" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/Qualcomm/sdm845/HiFi-MM1.conf new/alsa-ucm-conf-1.2.12/ucm2/Qualcomm/sdm845/HiFi-MM1.conf --- old/alsa-ucm-conf-1.2.11/ucm2/Qualcomm/sdm845/HiFi-MM1.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/Qualcomm/sdm845/HiFi-MM1.conf 2024-06-10 14:13:03.000000000 +0200 @@ -40,7 +40,7 @@ PlaybackPriority 100 PlaybackPCM "hw:${CardId},0" PlaybackMixer "default:${CardId}" - PlaybackMixerElem "Speaker Digital" + PlaybackMixerElem "Speaker" } } @@ -54,7 +54,8 @@ PlaybackPriority 200 PlaybackPCM "hw:${CardId},2" PlaybackMixer "default:${CardId}" - PlaybackMixerElem "HP Digital" + PlaybackMixerElem "HP" + JackControl "Headphone Jack" } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/Qualcomm/x1e80100/HiFi.conf new/alsa-ucm-conf-1.2.12/ucm2/Qualcomm/x1e80100/HiFi.conf --- old/alsa-ucm-conf-1.2.11/ucm2/Qualcomm/x1e80100/HiFi.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/Qualcomm/x1e80100/HiFi.conf 2024-06-10 14:13:03.000000000 +0200 @@ -28,6 +28,7 @@ Include.wsaspk.File "/codecs/wsa884x/four-speakers/SpeakerSeq.conf" Value { + PlaybackChannels 4 PlaybackPriority 100 PlaybackPCM "hw:${CardId},1" PlaybackMixer "default:${CardId}" @@ -47,8 +48,22 @@ PlaybackPriority 200 PlaybackPCM "hw:${CardId},0" PlaybackMixer "default:${CardId}" - PlaybackMixerElem "HP Digital" + PlaybackMixerElem "HP" JackControl "Headphone Jack" JackHWMute "Speaker" } } + +SectionDevice."Mic" { + Comment "Internal microphones" + + Include.vadm0e.File "/codecs/qcom-lpass/va-macro/DMIC0EnableSeq.conf" + Include.vadm0d.File "/codecs/qcom-lpass/va-macro/DMIC0DisableSeq.conf" + Include.vadm1e.File "/codecs/qcom-lpass/va-macro/DMIC1EnableSeq.conf" + Include.vadm1d.File "/codecs/qcom-lpass/va-macro/DMIC1DisableSeq.conf" + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},3" + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/USB-Audio/USB-Audio.conf new/alsa-ucm-conf-1.2.12/ucm2/USB-Audio/USB-Audio.conf --- old/alsa-ucm-conf-1.2.11/ucm2/USB-Audio/USB-Audio.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/USB-Audio/USB-Audio.conf 2024-06-10 14:13:03.000000000 +0200 @@ -59,6 +59,7 @@ # 0b05:1a53 ALC4082 on ASUS ROG Crosshair X670E Extreme # 0b05:1a5c ASUS ROG Strix B650E-I Gaming WiFi # 0b05:1a97 ASUS ROG Maximus Z790 Apex Encore + # 0b05:1af1 ASUS ROG Strix Z790-A Gaming Wifi II # 0db0:005a MSI MPG Z690 CARBON WIFI # 0db0:124b MSI MEG Z690 ACE # 0db0:151f MSI X570S EDGE MAX WIFI @@ -68,6 +69,7 @@ # 0db0:419c MSI MPG X570S Carbon Max Wifi # 0db0:422d MSI Mag B650 Tomahawk Wifi # 0db0:4240 MSI MAG Z590 Tomahawk Wifi + # 0db0:488c MSI MEG Z790 Ace # 0db0:62a4 MSI MPG Z790I Edge WiFi # 0db0:6c09 MSI MPG Z790 Carbon Wifi # 0db0:6cc9 MSI MPG Z590 Gaming Plus @@ -85,7 +87,7 @@ # 0db0:d6e7 MSI MPG X670E Carbon Wifi # 26ce:0a06 ASRock X670E/Z790 Taichi # 26ce:0a08 ASRock Z790 PG-ITX/TB4 - Regex "USB((0414:a0(0e|1[0124]))|(0b05:(19(84|9[69])|1a(16|2[07]|5[23c]|97)))|(0db0:(005a|124b|151f|1feb|3130|36e7|419c|422d|4240|62a4|6c[0c]9|70d3|7696|82c7|8af7|961e|a(073|228|47c|74b)|b202|d1d7|d6e7))|(26ce:0a0[68]))" + Regex "USB((0414:a0(0e|1[0124]))|(0b05:(19(84|9[69])|1a(16|2[07]|5[23c]|97|f1)))|(0db0:(005a|124b|151f|1feb|3130|36e7|4(19c|22d|240|88c)|62a4|6c[0c]9|70d3|7696|82c7|8af7|961e|a(073|228|47c|74b)|b202|d1d7|d6e7))|(26ce:0a0[68]))" } True.Define.ProfileName "Realtek/ALC4080" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc3/eq_fir/README.md new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc3/eq_fir/README.md --- old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc3/eq_fir/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc3/eq_fir/README.md 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,7 @@ +# How to build + +These blobs were exported with example_fir_eq.m tool from +[SOF](https://github.com/thesofproject/sof) + +Usage: +cd tools/tune/eq; octave --no-window-system example_fir_eq.m Binary files old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc3/eq_fir/pass.blob and new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc3/eq_fir/pass.blob differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc3/eq_iir/README.md new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc3/eq_iir/README.md --- old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc3/eq_iir/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc3/eq_iir/README.md 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,7 @@ +# How to build + +These blobs were exported with example_iir_eq.m tool from +[SOF](https://github.com/thesofproject/sof) + +Usage: +cd tools/tune/eq; octave --no-window-system example_iir_eq.m Binary files old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc3/eq_iir/highpass_100hz_0db_48khz.blob and new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc3/eq_iir/highpass_100hz_0db_48khz.blob differ Binary files old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc3/eq_iir/highpass_20hz_0db_48khz.blob and new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc3/eq_iir/highpass_20hz_0db_48khz.blob differ Binary files old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc3/eq_iir/highpass_50hz_0db_48khz.blob and new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc3/eq_iir/highpass_50hz_0db_48khz.blob differ Binary files old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc3/eq_iir/pass.blob and new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc3/eq_iir/pass.blob differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc4/drc/README.md new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc4/drc/README.md --- old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc4/drc/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc4/drc/README.md 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,7 @@ +# How to build + +These blobs were exported with example_drc.m tool from +[SOF](https://github.com/thesofproject/sof) + +Usage: +cd tools/tune/drc; octave --no-window-system example_drc.m Binary files old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc4/drc/passthrough.blob and new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc4/drc/passthrough.blob differ Binary files old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc4/drc/speaker_default.blob and new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc4/drc/speaker_default.blob differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc4/eq_fir/README.md new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc4/eq_fir/README.md --- old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc4/eq_fir/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc4/eq_fir/README.md 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,7 @@ +# How to build + +These blobs were exported with example_fir_eq.m tool from +[SOF](https://github.com/thesofproject/sof) + +Usage: +cd tools/tune/eq; octave --no-window-system example_fir_eq.m Binary files old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc4/eq_fir/pass.blob and new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc4/eq_fir/pass.blob differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc4/eq_iir/README.md new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc4/eq_iir/README.md --- old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc4/eq_iir/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc4/eq_iir/README.md 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,7 @@ +# How to build + +These blobs were exported with example_iir_eq.m tool from +[SOF](https://github.com/thesofproject/sof) + +Usage: +cd tools/tune/eq; octave --no-window-system example_iir_eq.m Binary files old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc4/eq_iir/highpass_100hz_0db_48khz.blob and new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc4/eq_iir/highpass_100hz_0db_48khz.blob differ Binary files old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc4/eq_iir/highpass_20hz_0db_48khz.blob and new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc4/eq_iir/highpass_20hz_0db_48khz.blob differ Binary files old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc4/eq_iir/highpass_50hz_0db_48khz.blob and new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc4/eq_iir/highpass_50hz_0db_48khz.blob differ Binary files old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/ipc4/eq_iir/pass.blob and new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/ipc4/eq_iir/pass.blob differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/product_configs/AAEON/UPX-TGL01.conf new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/product_configs/AAEON/UPX-TGL01.conf --- old/alsa-ucm-conf-1.2.11/ucm2/blobs/sof/product_configs/AAEON/UPX-TGL01.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/blobs/sof/product_configs/AAEON/UPX-TGL01.conf 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,10 @@ +# Add customization of IIR, FIR, and DRC +# Note: Use the correct IPC version for the blobs path + +# Example set all processing to bypass +#Define.SpeakerIirBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/eq_iir/pass.blob" +#Define.SpeakerFirBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/eq_fir/pass.blob" +#Define.SpeakerDrcBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/drc/passthrough.blob" +#Define.HeadphoneIirBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/eq_iir/pass.blob" +#Define.HeadphoneFirBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/eq_fir/pass.blob" +#Define.HeadphoneDrcBlob "/usr/share/alsa/ucm2/blobs/sof/ipc4/drc/passthrough.blob" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf new/alsa-ucm-conf-1.2.12/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf --- old/alsa-ucm-conf-1.2.11/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicDisableSeq.conf 2024-06-10 14:13:03.000000000 +0200 @@ -1,5 +1,4 @@ DisableSequence [ cset "name='TX SMIC MUX0' ZERO" cset "name='TX_AIF1_CAP Mixer DEC0' 0" - cset "name='TX1 MODE' ADC_INVALID" ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicEnableSeq.conf new/alsa-ucm-conf-1.2.12/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicEnableSeq.conf --- old/alsa-ucm-conf-1.2.11/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicEnableSeq.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/codecs/qcom-lpass/tx-macro/HeadphoneMicEnableSeq.conf 2024-06-10 14:13:03.000000000 +0200 @@ -2,6 +2,5 @@ cset "name='TX DEC0 MUX' SWR_MIC" cset "name='TX SMIC MUX0' ADC1" cset "name='TX_AIF1_CAP Mixer DEC0' 1" - cset "name='TX1 MODE' ADC_NORMAL" cset "name='TX_DEC0 Volume' 110" ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/codecs/rt722/init.conf new/alsa-ucm-conf-1.2.12/ucm2/codecs/rt722/init.conf --- old/alsa-ucm-conf-1.2.11/ucm2/codecs/rt722/init.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/codecs/rt722/init.conf 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,11 @@ +# RT722-sdca specific volume control settings + +BootSequence [ + cset "name='rt722 ADC 24 Mux' 'DMIC1'" + cset "name='rt722 ADC 25 Mux' 'DMIC2'" + cset "name='rt722 ADC 22 Mux' 'MIC2'" + cset "name='rt722 FU1E Capture Volume' 63" + cset "name='rt722 FU06 Playback Volume' 60" + cset "name='rt722 FU05 Playback Volume' 35" + cset "name='rt722 FU0F Capture Volume' 63" +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/codecs/wcd937x/HeadphoneDisableSeq.conf new/alsa-ucm-conf-1.2.12/ucm2/codecs/wcd937x/HeadphoneDisableSeq.conf --- old/alsa-ucm-conf-1.2.11/ucm2/codecs/wcd937x/HeadphoneDisableSeq.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/codecs/wcd937x/HeadphoneDisableSeq.conf 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,6 @@ +DisableSequence [ + cset "name='HPHL_RDAC Switch' 0" + cset "name='HPHR_RDAC Switch' 0" + cset "name='HPHL Switch' 0" + cset "name='HPHR Switch' 0" +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/codecs/wcd937x/HeadphoneEnableSeq.conf new/alsa-ucm-conf-1.2.12/ucm2/codecs/wcd937x/HeadphoneEnableSeq.conf --- old/alsa-ucm-conf-1.2.11/ucm2/codecs/wcd937x/HeadphoneEnableSeq.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/codecs/wcd937x/HeadphoneEnableSeq.conf 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,6 @@ +EnableSequence [ + cset "name='HPHL_RDAC Switch' 1" + cset "name='HPHR_RDAC Switch' 1" + cset "name='HPHL Switch' 1" + cset "name='HPHR Switch' 1" +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/codecs/wcd937x/HeadphoneMicDisableSeq.conf new/alsa-ucm-conf-1.2.12/ucm2/codecs/wcd937x/HeadphoneMicDisableSeq.conf --- old/alsa-ucm-conf-1.2.11/ucm2/codecs/wcd937x/HeadphoneMicDisableSeq.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/codecs/wcd937x/HeadphoneMicDisableSeq.conf 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,4 @@ +DisableSequence [ + cset "name='ADC2_MIXER Switch' 0" + cset "name='ADC2 Switch' 0" +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/codecs/wcd937x/HeadphoneMicEnableSeq.conf new/alsa-ucm-conf-1.2.12/ucm2/codecs/wcd937x/HeadphoneMicEnableSeq.conf --- old/alsa-ucm-conf-1.2.11/ucm2/codecs/wcd937x/HeadphoneMicEnableSeq.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/codecs/wcd937x/HeadphoneMicEnableSeq.conf 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,5 @@ +EnableSequence [ + cset "name='ADC2_MIXER Switch' 1" + cset "name='ADC2 MUX' INP2" + cset "name='ADC2 Switch' 1" +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/codecs/wcd937x/init.conf new/alsa-ucm-conf-1.2.12/ucm2/codecs/wcd937x/init.conf --- old/alsa-ucm-conf-1.2.11/ucm2/codecs/wcd937x/init.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/codecs/wcd937x/init.conf 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,12 @@ +# WCD937X specific volume control settings + +LibraryConfig.remap.Config { + + ctl.default.map { + # Merge two mono controls into one stereo + "name='HP Volume'" { + "name='HPHL Volume'".vindex.0 0 + "name='HPHR Volume'".vindex.1 0 + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/codecs/wcd938x/HeadphoneMicDisableSeq.conf new/alsa-ucm-conf-1.2.12/ucm2/codecs/wcd938x/HeadphoneMicDisableSeq.conf --- old/alsa-ucm-conf-1.2.11/ucm2/codecs/wcd938x/HeadphoneMicDisableSeq.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/codecs/wcd938x/HeadphoneMicDisableSeq.conf 2024-06-10 14:13:03.000000000 +0200 @@ -1,4 +1,5 @@ DisableSequence [ cset "name='ADC2_MIXER Switch' 0" cset "name='ADC2 Switch' 0" + set "name='TX1 MODE' ADC_INVALID" ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf new/alsa-ucm-conf-1.2.12/ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf --- old/alsa-ucm-conf-1.2.11/ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/codecs/wcd938x/HeadphoneMicEnableSeq.conf 2024-06-10 14:13:03.000000000 +0200 @@ -3,4 +3,5 @@ cset "name='HDR12 MUX' NO_HDR12" cset "name='ADC2 MUX' INP2" cset "name='ADC2 Switch' 1" + set "name='TX1 MODE' ADC_NORMAL" ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/common/pcm/hdmi.conf new/alsa-ucm-conf-1.2.12/ucm2/common/pcm/hdmi.conf --- old/alsa-ucm-conf-1.2.11/ucm2/common/pcm/hdmi.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/common/pcm/hdmi.conf 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,74 @@ +# Macro HdmiPCM - Generate ALSA control section for hdmi: PCM device +# +# Arguments: +# Device - hardware PCM device +# Index - hdmi: device index and control index +# + +DefineMacro.HdmiPCM { + LibraryConfig.generic.Config.hdmi-pcm.pcm.hdmi."${var:__Index}" { + @args [ CARD AES0 AES1 AES2 AES3 ] + @args.CARD { + type string + } + @args.AES0 { + type integer + } + @args.AES1 { + type integer + } + @args.AES2 { + type integer + } + @args.AES3 { + type integer + } + type hooks + slave.pcm { + type hw + card $CARD + device "${evali:$__Device}" + } + hooks.0 { + type ctl_elems + hook_args [ + { + name "IEC958 Playback Default" + index "${evali:$__Index}" + lock true + preserve true + value [ $AES0 $AES1 $AES2 $AES3 ] + } + { + name "IEC958 Playback Switch" + index "${evali:$__Index}" + value true + } + ] + } + hint.device "${evali:$__Device}" + } +} + +# Macro HdmiPCMSave - Save the generated ALSA control for hdmi: PCM device(s) +# generated inside 'hdmi-pcm' section by prior calls to +# HdmiPCM macro +# +# Arguments: +# [Name] - Optional name excluding the .conf extension to use for the +# configuration file, defaults to "42-hdmi-pcm" +# + +DefineMacro.HdmiPCMSave { + If.name { + Condition { + Type String + Empty "${var:-__Name}" + } + True.Define.__Name "42-hdmi-pcm" + } + + FixedBootSequence [ + cfg-save "${var:LibDir}/${var:__Name}.conf:hdmi-pcm" + ] +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/conf.d/SC7180/sc7180-adau7002-max98357a.conf new/alsa-ucm-conf-1.2.12/ucm2/conf.d/SC7180/sc7180-adau7002-max98357a.conf --- old/alsa-ucm-conf-1.2.11/ucm2/conf.d/SC7180/sc7180-adau7002-max98357a.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/conf.d/SC7180/sc7180-adau7002-max98357a.conf 2024-06-14 18:57:58.822645006 +0200 @@ -0,0 +1 @@ +symbolic link to ../../Qualcomm/sc7180/adau7002-max98357a/sc7180-adau7002-max98357a.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/conf.d/sof-m8195_r1019/sof-m8195_r1019_5682s.conf new/alsa-ucm-conf-1.2.12/ucm2/conf.d/sof-m8195_r1019/sof-m8195_r1019_5682s.conf --- old/alsa-ucm-conf-1.2.11/ucm2/conf.d/sof-m8195_r1019/sof-m8195_r1019_5682s.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/conf.d/sof-m8195_r1019/sof-m8195_r1019_5682s.conf 2024-06-14 18:57:58.690640246 +0200 @@ -0,0 +1 @@ +symbolic link to ../../MediaTek/mt8195-sof/mt6359-rt1019-rt5682/sof-mt8195-mt6359-rt1019-rt5682.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/sof-soundwire/HiFi.conf new/alsa-ucm-conf-1.2.12/ucm2/sof-soundwire/HiFi.conf --- old/alsa-ucm-conf-1.2.11/ucm2/sof-soundwire/HiFi.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/sof-soundwire/HiFi.conf 2024-06-10 14:13:03.000000000 +0200 @@ -8,6 +8,14 @@ Value.TQ "HiFi" } +If.multicodec { + Condition { + Type String + Empty "${var:MultiCodec1}" + } + False.Include.multicodec.File "/sof-soundwire/${var:MultiCodec1}.conf" +} + If.spkdev { Condition { Type String diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/sof-soundwire/cs42l43-spk.conf new/alsa-ucm-conf-1.2.12/ucm2/sof-soundwire/cs42l43-spk.conf --- old/alsa-ucm-conf-1.2.11/ucm2/sof-soundwire/cs42l43-spk.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/sof-soundwire/cs42l43-spk.conf 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,25 @@ +# Use case Configuration for sof-soundwire card + +SectionDevice."Speaker" { + Comment "Speaker" + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cset "name='cs42l43 Speaker L Input 1' 'DP5RX1'" + cset "name='cs42l43 Speaker R Input 1' 'DP5RX2'" + ] + + DisableSequence [ + cset "name='cs42l43 Speaker L Input 1' 'None'" + cset "name='cs42l43 Speaker R Input 1' 'None'" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},0" + PlaybackMixerElem "cs42l43 Speaker Digital" + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/sof-soundwire/rt1308.conf new/alsa-ucm-conf-1.2.12/ucm2/sof-soundwire/rt1308.conf --- old/alsa-ucm-conf-1.2.11/ucm2/sof-soundwire/rt1308.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/sof-soundwire/rt1308.conf 2024-06-10 14:13:03.000000000 +0200 @@ -28,8 +28,9 @@ SectionDevice."Speaker" { Comment "Speaker" - Macro.num1.rt1308spk { ForAmps "[12]" Amp 1 Sel LL } - Macro.num2.rt1308spk { ForAmps "2" Amp 2 Sel RR } + Macro.num1.rt1308spk { ForAmps "1" Amp 1 Sel LR } + Macro.num2.rt1308spk { ForAmps "2" Amp 1 Sel LL } + Macro.num3.rt1308spk { ForAmps "2" Amp 2 Sel RR } EnableSequence [ cset "name='Speaker Switch' on" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/sof-soundwire/rt1316.conf new/alsa-ucm-conf-1.2.12/ucm2/sof-soundwire/rt1316.conf --- old/alsa-ucm-conf-1.2.11/ucm2/sof-soundwire/rt1316.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/sof-soundwire/rt1316.conf 2024-06-10 14:13:03.000000000 +0200 @@ -47,8 +47,9 @@ SectionDevice."Speaker" { Comment "Speaker" - Macro.num1.rt1316spk { ForAmps "[12]" Amp 1 Sel "L,L" } - Macro.num2.rt1316spk { ForAmps "2" Amp 2 Sel "R,R" } + Macro.num1.rt1316spk { ForAmps "1" Amp 1 Sel "L,R" } + Macro.num2.rt1316spk { ForAmps "2" Amp 1 Sel "L,L" } + Macro.num3.rt1316spk { ForAmps "2" Amp 2 Sel "R,R" } EnableSequence [ cset "name='Speaker Switch' on" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/sof-soundwire/rt1318.conf new/alsa-ucm-conf-1.2.12/ucm2/sof-soundwire/rt1318.conf --- old/alsa-ucm-conf-1.2.11/ucm2/sof-soundwire/rt1318.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/sof-soundwire/rt1318.conf 2024-06-10 14:13:03.000000000 +0200 @@ -9,16 +9,16 @@ DefineMacro.rt1318spk.If.0 { Condition { Type RegexMatch - Regex "${var:__RegEx}" + Regex "${var:__ForAmps}" String "${var:SpeakerAmps}" } True { EnableSequence [ - cset "name='rt1308-${var:__Amp} RX Channel Select' ${var:__Sel}" - cset "name='rt1308-${var:__Amp} DAC Switch' 1" + cset "name='rt1318-${var:__Amp} RX Channel Select' ${var:__Sel}" + cset "name='rt1318-${var:__Amp} DAC Switch' 1" ] DisableSequence [ - cset "name='rt1308-${var:__Amp} DAC Switch' 0" + cset "name='rt1318-${var:__Amp} DAC Switch' 0" ] } } @@ -26,8 +26,9 @@ SectionDevice."Speaker" { Comment "Speaker" - Macro.num1.rt1318spk { ForAmps "[12]" Amp 1 Sel "L,L" } - Macro.num2.rt1318spk { ForAmps "2" Amp 2 Sel "R,R" } + Macro.num1.rt1318spk { ForAmps "1" Amp 1 Sel "L,R" } + Macro.num2.rt1318spk { ForAmps "2" Amp 1 Sel "L,L" } + Macro.num3.rt1318spk { ForAmps "2" Amp 2 Sel "R,R" } EnableSequence [ cset "name='Speaker Switch' on" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/sof-soundwire/rt722.conf new/alsa-ucm-conf-1.2.12/ucm2/sof-soundwire/rt722.conf --- old/alsa-ucm-conf-1.2.11/ucm2/sof-soundwire/rt722.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/sof-soundwire/rt722.conf 2024-06-10 14:13:03.000000000 +0200 @@ -0,0 +1,97 @@ +# Use case Configuration for sof-soundwire card + +If.codecmic { + Condition { + Type RegexMatch + Regex "(rt722(-sdca)?)" + String "${var:MultiMicShadow}" + } + True { + SectionDevice."Mic" { + Comment "SoundWire microphones" + + EnableSequence [ + cset "name='rt722 FU1E Capture Switch' 1" + ] + + DisableSequence [ + cset "name='rt722 FU1E Capture Switch' 0" + ] + + Value { + CapturePriority 100 + CapturePCM "hw:${CardId},4" + CaptureSwitch "rt722 FU1E Capture Switch" + CaptureVolume "rt722 FU1E Capture Volume" + CaptureMixerElem "rt722 FU1E" + } + } + } +} + +If.codecspk { + Condition { + Type RegexMatch + Regex "(rt722(-sdca)?)" + String "${var:MultiSpeakerShadow}" + } + True { + SectionDevice."Speaker" { + Comment "Speaker" + + EnableSequence [ + cset "name='Speaker Switch' on" + ] + + DisableSequence [ + cset "name='Speaker Switch' off" + ] + + Value { + PlaybackPriority 100 + PlaybackPCM "hw:${CardId},2" + PlaybackMixerElem "rt722 FU06" + PlaybackVolume "rt722 FU06 Playback Volume" + } + } + } +} + +SectionDevice."Headphones" { + Comment "Headphones" + + EnableSequence [ + cset "name='Headphone Switch' on" + ] + + DisableSequence [ + cset "name='Headphone Switch' off" + ] + + Value { + PlaybackPriority 200 + PlaybackPCM "hw:${CardId}" + JackControl "Headphone Jack" + } +} + +SectionDevice."Headset" { + Comment "Headset Microphone" + + EnableSequence [ + cset "name='rt722 FU0F Capture Switch' 1" + ] + + DisableSequence [ + cset "name='rt722 FU0F Capture Switch' 0" + ] + + Value { + CapturePriority 200 + CapturePCM "hw:${CardId},1" + JackControl "Headset Mic Jack" + CaptureSwitch "rt722 FU0F Capture Switch" + CaptureVolume "rt722 FU0F Capture Volume" + CaptureMixerElem "rt722 FU0F" + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-ucm-conf-1.2.11/ucm2/sof-soundwire/sof-soundwire.conf new/alsa-ucm-conf-1.2.12/ucm2/sof-soundwire/sof-soundwire.conf --- old/alsa-ucm-conf-1.2.11/ucm2/sof-soundwire/sof-soundwire.conf 2024-01-29 13:57:47.000000000 +0100 +++ new/alsa-ucm-conf-1.2.12/ucm2/sof-soundwire/sof-soundwire.conf 2024-06-10 14:13:03.000000000 +0200 @@ -15,6 +15,8 @@ HeadsetCodec1 "" MicCodec1 "" Mics1 "0" + Iec61937Pcms1 "" + MultiCodec1 "" } DefineRegex { @@ -42,8 +44,64 @@ Regex " cfg-mics:([1-9][0-9]*)" String "${CardComponents}" } + Iec61937Pcms { + Regex "iec61937-pcm:(([0-9]+(,))*[0-9]+)" + String "${CardComponents}" + } + MultiCodec { + Regex "(rt722(-sdca)?)" + String "${var:SpeakerCodec1} ${var:HeadsetCodec1} ${var:MicCodec1}" + } } +If.multi_init { + Condition { + Type String + Empty "${var:MultiCodec1}" + } + False { + Define { + MultiSpeakerShadow "${var:SpeakerCodec1}" + MultiMicShadow "${var:MicCodec1}" + } + Include.multi_init.File "/codecs/${var:MultiCodec1}/init.conf" + } +} + +If.multi_speaker { + Condition { + Type RegexMatch + Regex "${var:SpeakerCodec1}" + String "${var:MultiCodec1}" + } + True { + Define.SpeakerCodec1 "" + } +} + +If.multi_mic { + Condition { + Type RegexMatch + Regex "${var:MicCodec1}" + String "${var:MultiCodec1}" + } + True { + Define.MicCodec1 "" + } +} + +If.multi_headset { + Condition { + Type RegexMatch + Regex "${var:HeadsetCodec1}" + String "${var:MultiCodec1}" + } + True { + Define.HeadsetCodec1 "" + } +} + + If.hs_init { Condition { Type RegexMatch @@ -103,3 +161,41 @@ exec "-nhlt-dmic-info -o ${var:LibDir}/dmics-nhlt.json" } } + +Include.hdmi-pcm.File "/common/pcm/hdmi.conf" + +If.Hdmi5-iec61937 { + Condition { + Type RegexMatch + Regex "((^|,)[5](,|$))" + String "${var:Iec61937Pcms1}" + } + True.Macro.hdmi5.HdmiPCM { Device 5 Index 0 } +} + +If.Hdmi6-iec61937 { + Condition { + Type RegexMatch + Regex "((^|,)[6](,|$))" + String "${var:Iec61937Pcms1}" + } + True.Macro.hdmi6.HdmiPCM { Device 6 Index 1 } +} + +If.Hdmi7-iec61937 { + Condition { + Type RegexMatch + Regex "((^|,)[7](,|$))" + String "${var:Iec61937Pcms1}" + } + True.Macro.hdmi7.HdmiPCM { Device 7 Index 2 } +} + +If.HdmiIec61937 { + Condition { + Type RegexMatch + Regex "((^|,)[567](,|$))" + String "${var:Iec61937Pcms1}" + } + True.Macro.save_hdmi_cfg.HdmiPCMSave { Name "42-sof-hdmi" } +}
