From de529410da2f8b2905eda7d5eff52bc69e148fe3 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Date: Tue, 23 Apr 2024 10:09:46 +0300
Subject: [PATCH] conf: aliases: hdmi: Include unconditionally the

The hdmi.conf contains the high level macro to be used by cards to create
the hdmi: device.
Instead of including it in different config files, include it in the main
aliases.conf and remove it's inclusion by other config files.

This change is needed to add support for the hdmi: device mapping via UCM.

Closes: https://github.com/alsa-project/alsa-lib/pull/393
Suggested-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---
 src/conf/cards/HDA-Intel.conf    | 2 --
 src/conf/cards/HdmiLpeAudio.conf | 2 --
 src/conf/cards/aliases.conf      | 1 +
 src/conf/cards/vc4-hdmi.conf     | 2 --
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/conf/cards/HDA-Intel.conf b/src/conf/cards/HDA-Intel.conf
index d5a65906..5451606f 100644
--- a/src/conf/cards/HDA-Intel.conf
+++ b/src/conf/cards/HDA-Intel.conf
@@ -163,8 +163,6 @@ HDA-Intel.pcm.iec958.0 {
 	hint.device 1
 }
 
-<confdir:pcm/hdmi.conf>
-
 HDA-Intel.pcm.hdmi.common {
 	@args [ CARD DEVICE CTLINDEX AES0 AES1 AES2 AES3 ]
 	@args.CARD {
diff --git a/src/conf/cards/HdmiLpeAudio.conf b/src/conf/cards/HdmiLpeAudio.conf
index a1e493da..a9104f43 100644
--- a/src/conf/cards/HdmiLpeAudio.conf
+++ b/src/conf/cards/HdmiLpeAudio.conf
@@ -2,8 +2,6 @@
 # Configuration for the Intel HDMI/DP LPE audio
 #
 
-<confdir:pcm/hdmi.conf>
-
 HdmiLpeAudio.pcm.hdmi.0 {
 	@args [ CARD AES0 AES1 AES2 AES3 ]
 	@args.CARD {
diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf
index 7e352f76..a54824ae 100644
--- a/src/conf/cards/aliases.conf
+++ b/src/conf/cards/aliases.conf
@@ -62,3 +62,4 @@ VC4-HDMI cards.vc4-hdmi
 <confdir:pcm/default.conf>
 <confdir:pcm/dmix.conf>
 <confdir:pcm/dsnoop.conf>
+<confdir:pcm/hdmi.conf>
diff --git a/src/conf/cards/vc4-hdmi.conf b/src/conf/cards/vc4-hdmi.conf
index af87b3a8..0f313d82 100644
--- a/src/conf/cards/vc4-hdmi.conf
+++ b/src/conf/cards/vc4-hdmi.conf
@@ -3,8 +3,6 @@
 # subframe conversion
 #
 
-<confdir:pcm/hdmi.conf>
-
 vc4-hdmi.pcm.hdmi.0 {
 	@args [ CARD AES0 AES1 AES2 AES3 ]
 	@args.CARD {
-- 
2.47.1