From 474f7fd4c18a60ba4c6f7a22005409e8b5b4429c Mon Sep 17 00:00:00 2001 From: Jaska Uimonen Date: Fri, 25 Oct 2019 20:23:56 +0300 Subject: [PATCH] sof-skl_hda: move hdmi as separate use case Move hdmi definitions as separate use case and conf file. This will enable Pulseaudio to create separate profile for hdmi and make routing much more fluent than with single profile. Signed-off-by: Jaska Uimonen Signed-off-by: Jaroslav Kysela --- ucm/sof-skl_hda_card/Hdmi.conf | 80 ++++++++++++++++++++++ ucm/sof-skl_hda_card/HiFi.conf | 67 ------------------ ucm/sof-skl_hda_card/sof-skl_hda_card.conf | 4 ++ 3 files changed, 84 insertions(+), 67 deletions(-) create mode 100644 ucm/sof-skl_hda_card/Hdmi.conf diff --git a/ucm/sof-skl_hda_card/Hdmi.conf b/ucm/sof-skl_hda_card/Hdmi.conf new file mode 100644 index 0000000..bfb7b20 --- /dev/null +++ b/ucm/sof-skl_hda_card/Hdmi.conf @@ -0,0 +1,80 @@ +# Use case Configuration for skl-hda-card + +SectionVerb { + + EnableSequence [ + cdev "hw:sofsklhdacard" + cset "name='Master Playback Switch' on" + cset "name='Capture Switch' on" + ] + + 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" + } +} diff --git a/ucm/sof-skl_hda_card/HiFi.conf b/ucm/sof-skl_hda_card/HiFi.conf index 09b5024..37ea1a3 100644 --- a/ucm/sof-skl_hda_card/HiFi.conf +++ b/ucm/sof-skl_hda_card/HiFi.conf @@ -106,70 +106,3 @@ SectionDevice."Dmic" { CaptureChannels "2" } } - -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" - } -} - diff --git a/ucm/sof-skl_hda_card/sof-skl_hda_card.conf b/ucm/sof-skl_hda_card/sof-skl_hda_card.conf index 041ad15..2b7196f 100644 --- a/ucm/sof-skl_hda_card/sof-skl_hda_card.conf +++ b/ucm/sof-skl_hda_card/sof-skl_hda_card.conf @@ -3,3 +3,7 @@ SectionUseCase."HiFi" { Comment "Play HiFi quality Music" } +SectionUseCase."Hdmi" { + File "Hdmi.conf" + Comment "Play to Hdmi" +} -- 2.47.1