diff --git a/ucm2/sof-soundwire/sof-soundwire.conf b/ucm2/sof-soundwire/sof-soundwire.conf
index 35a262c4..34ceb64c 100644
--- a/ucm2/sof-soundwire/sof-soundwire.conf
+++ b/ucm2/sof-soundwire/sof-soundwire.conf
@@ -15,6 +15,7 @@ Define {
 	HeadsetCodec1 ""
 	MicCodec1 ""
 	Mics1 "0"
+	Iec61937Pcms1 ""
 }
 
 DefineRegex {
@@ -42,6 +43,10 @@ DefineRegex {
 		Regex " cfg-mics:([1-9][0-9]*)"
 		String "${CardComponents}"
 	}
+	Iec61937Pcms {
+		Regex "iec61937-pcm:(([0-9]+(,))*[0-9]+)"
+		String "${CardComponents}"
+	}
 }
 
 If.hs_init {
@@ -103,3 +108,41 @@ If.mics-array {
 		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" }
+}