From 32736b891913bf610bdacb259ff17607a4caf8ec Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Wed, 23 Oct 2019 18:27:33 +0300 Subject: [PATCH] sof-skl_hda: change to use common HDMI codec driver Modify UCM sequences to use user-space interface of the common HDMI codec driver. Use of hdac-hdmi driver is no longer supported by this UCM file. To use this UCM file, kernel must be compiled with SND_SOC_SOF_HDA_COMMON_HDMI_CODEC Signed-off-by: Kai Vehmanen Signed-off-by: Jaroslav Kysela --- ucm/sof-skl_hda_card/Hdmi.conf | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/ucm/sof-skl_hda_card/Hdmi.conf b/ucm/sof-skl_hda_card/Hdmi.conf index bfb7b20..38e2851 100644 --- a/ucm/sof-skl_hda_card/Hdmi.conf +++ b/ucm/sof-skl_hda_card/Hdmi.conf @@ -18,20 +18,18 @@ SectionDevice."HDMI1" { EnableSequence [ cdev "hw:sofsklhdacard" - cset "name='hif5-0 Jack Switch' on" - cset "name='Pin5-Port0 Mux' 1" + cset "name='IEC958 Playback Switch' on" ] DisableSequence [ cdev "hw:sofsklhdacard" - cset "name='Pin5-Port0 Mux' 0" - cset "name='hif5-0 Jack Switch' off" + cset "name='IEC958 Playback Switch' off" ] Value { - PlaybackPCM "hw:0,3" + PlaybackPCM "hw:sofsklhdacard,3" PlaybackChannels "2" - JackControl "HDMI/DP, pcm=11 Jack" + JackControl "HDMI/DP,pcm=3 Jack" } } @@ -40,20 +38,18 @@ SectionDevice."HDMI2" { EnableSequence [ cdev "hw:sofsklhdacard" - cset "name='hif6-0 Jack Switch' on" - cset "name='Pin6-Port0 Mux' 2" + cset "name='IEC958 Playback Switch',index=1 on" ] DisableSequence [ cdev "hw:sofsklhdacard" - cset "name='Pin6-Port0 Mux' 0" - cset "name='hif6-0 Jack Switch' off" + cset "name='IEC958 Playback Switch',index=1 off" ] Value { - PlaybackPCM "hw:0,4" + PlaybackPCM "hw:sofsklhdacard,4" PlaybackChannels "2" - JackControl "HDMI/DP, pcm=12 Jack" + JackControl "HDMI/DP,pcm=4 Jack" } } @@ -62,19 +58,17 @@ SectionDevice."HDMI3" { EnableSequence [ cdev "hw:sofsklhdacard" - cset "name='hif7-0 Jack Switch' on" - cset "name='Pin7-Port0 Mux' 3" + cset "name='IEC958 Playback Switch',index=2 on" ] DisableSequence [ cdev "hw:sofsklhdacard" - cset "name='Pin7-Port0 Mux' 0" - cset "name='hif7-0 Jack Switch' off" + cset "name='IEC958 Playback Switch',index=2 off" ] Value { - PlaybackPCM "hw:0,5" + PlaybackPCM "hw:sofsklhdacard,5" PlaybackChannels "2" - JackControl "HDMI/DP, pcm=13 Jack" + JackControl "HDMI/DP,pcm=5 Jack" } } -- 2.47.1