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 <jaska.uimonen@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm/sof-skl_hda_card/Hdmi.conf b/ucm/sof-skl_hda_card/Hdmi.conf
new file mode 100644 (file)
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 09b5024d9251d40ed65125616f980aef1e089bab..37ea1a3bac2262b4b5795f7fab7251b66ddb1c9e 100644 (file)
--- 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 041ad15895a53d28f131cb5fd0016961d3dfc046..2b7196fef0f8d6dbf0904b3ca8719a18a6138f49 100644 (file)
--- 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"
+}