ucm2: MediaTek: mt8391-evk: Add DisplayPort output audio support

Add an HDMI device for DisplayPort output on hw:CardId,5, guarded by a
ControlExists condition on the 'DP Jack' control so it only shows up
when the DPTX back end is enabled in the device tree.

Closes: https://github.com/alsa-project/alsa-ucm-conf/pull/797
Signed-off-by: Zoran Zhan <zoran.zhan@mediatek.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/MediaTek/mt8391-evk/HiFi.conf b/ucm2/MediaTek/mt8391-evk/HiFi.conf
index 180941a3b4e4ab72ca267171973218a3ed98f8ac..f002796f310157b10447dc2bcba87e21620d8ad4 100644 (file)
--- a/ucm2/MediaTek/mt8391-evk/HiFi.conf
+++ b/ucm2/MediaTek/mt8391-evk/HiFi.conf
@@ -1,3 +1,22 @@
+If.DP {
+       Condition {
+               Type ControlExists
+               Control "iface=CARD,name='DP Jack'"
+       }
+       True {
+               SectionDevice."HDMI" {
+                       Comment "DP output"
+
+                       Value {
+                               PlaybackPriority 300
+                               PlaybackChannels 2
+                               PlaybackPCM "hw:${CardId},5"
+                               JackControl "DP Jack"
+                       }
+               }
+       }
+}
+
 SectionDevice."Speaker" {
        Comment "Lineout speaker"
 
@@ -14,7 +33,7 @@ SectionDevice."Speaker" {
        ]
 
        Value {
-               PlaybackPriority 300
+               PlaybackPriority 400
                PlaybackChannels 2
                PlaybackPCM "hw:${CardId},${var:PlayDevN}"
                PlaybackVolume "Lineout Volume"
@@ -37,7 +56,7 @@ SectionDevice."Headphones" {
        ]
 
        Value {
-               PlaybackPriority 400
+               PlaybackPriority 500
                PlaybackChannels 2
                PlaybackPCM "hw:${CardId},${var:PlayDevN}"
                PlaybackVolume "Headset Volume"

diff --git a/ucm2/MediaTek/mt8391-evk/init.conf b/ucm2/MediaTek/mt8391-evk/init.conf
index 1a7ea4e95be02b218f12e4586e2ea15ddd5dba99..e03f8dd42c9930e1b2120f6fffd7cf05b0f68695 100644 (file)
--- a/ucm2/MediaTek/mt8391-evk/init.conf
+++ b/ucm2/MediaTek/mt8391-evk/init.conf
@@ -22,4 +22,7 @@ BootSequence [
        cset "name='UL4_CH2 PCM_0_CAP_CH2' on"
        cset "name='I2S_IN0_Mux' Dummy_Widget"
        cset "name='I2S_OUT0_Mux' Dummy_Widget"
+       cset "name='HDMI_CH0_MUX' CH0"
+       cset "name='HDMI_CH1_MUX' CH1"
+       cset "name='DPTX_OUT_MUX' Connect"
 ]