From edbbde77a950bfe7663d082bdbcb704664aa327c Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@gmail.com>
Date: Mon, 11 Oct 2021 22:29:51 +0200
Subject: [PATCH] Allwinner: alsa: Fix configuration

---
 .../usr/share/alsa/cards/allwinner-hdmi.conf  |  34 -----
 .../usr/share/alsa/cards/allwinner-spdif.conf |  34 -----
 .../usr/share/alsa/cards/simple-card.conf     | 131 ++++++++++++++++++
 3 files changed, 131 insertions(+), 68 deletions(-)
 delete mode 100644 projects/Allwinner/filesystem/usr/share/alsa/cards/allwinner-hdmi.conf
 delete mode 100644 projects/Allwinner/filesystem/usr/share/alsa/cards/allwinner-spdif.conf
 create mode 100644 projects/Allwinner/filesystem/usr/share/alsa/cards/simple-card.conf

diff --git a/projects/Allwinner/filesystem/usr/share/alsa/cards/allwinner-hdmi.conf b/projects/Allwinner/filesystem/usr/share/alsa/cards/allwinner-hdmi.conf
deleted file mode 100644
index d9295919cd..0000000000
--- a/projects/Allwinner/filesystem/usr/share/alsa/cards/allwinner-hdmi.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Configuration for HDMI
-#
-
-<confdir:pcm/hdmi.conf>
-
-allwinner-hdmi.pcm.hdmi.0 {
-	@args [ CARD AES0 AES1 AES2 AES3 ]
-	@args.CARD { type string }
-	@args.AES0 { type integer }
-	@args.AES1 { type integer }
-	@args.AES2 { type integer }
-	@args.AES3 { type integer }
-	type hooks
-	slave.pcm {
-		type hw
-		card $CARD
-		device 0
-	}
-	hooks.0 {
-		type ctl_elems
-		hook_args [
-			{
-				interface MIXER
-				name "IEC958 Playback Default"
-				lock true
-				preserve true
-				optional true
-				value [ $AES0 $AES1 $AES2 $AES3 ]
-			}
-		]
-	}
-	hint.device 0
-}
diff --git a/projects/Allwinner/filesystem/usr/share/alsa/cards/allwinner-spdif.conf b/projects/Allwinner/filesystem/usr/share/alsa/cards/allwinner-spdif.conf
deleted file mode 100644
index a8e228a139..0000000000
--- a/projects/Allwinner/filesystem/usr/share/alsa/cards/allwinner-spdif.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Configuration for SPDIF
-#
-
-<confdir:pcm/iec958.conf>
-
-On-board_SPDIF.pcm.iec958.0 {
-	@args [ CARD AES0 AES1 AES2 AES3 ]
-	@args.CARD { type string }
-	@args.AES0 { type integer }
-	@args.AES1 { type integer }
-	@args.AES2 { type integer }
-	@args.AES3 { type integer }
-	type hooks
-	slave.pcm {
-		type hw
-		card $CARD
-		device 0
-	}
-	hooks.0 {
-		type ctl_elems
-		hook_args [
-			{
-				interface MIXER
-				name "IEC958 Playback Default"
-				lock true
-				preserve true
-				optional true
-				value [ $AES0 $AES1 $AES2 $AES3 ]
-			}
-		]
-	}
-	hint.device 0
-}
diff --git a/projects/Allwinner/filesystem/usr/share/alsa/cards/simple-card.conf b/projects/Allwinner/filesystem/usr/share/alsa/cards/simple-card.conf
new file mode 100644
index 0000000000..10579f540d
--- /dev/null
+++ b/projects/Allwinner/filesystem/usr/share/alsa/cards/simple-card.conf
@@ -0,0 +1,131 @@
+#
+# Configuration for HDMI
+#
+
+<confdir:pcm/hdmi.conf>
+
+simple-card.pcm.hdmi."allwinner-hdmi" {
+	@args [ CARD DEVICE AES0 AES1 AES2 AES3 ]
+	@args.CARD { type string }
+	@args.DEVICE { type integer }
+	@args.AES0 { type integer }
+	@args.AES1 { type integer }
+	@args.AES2 { type integer }
+	@args.AES3 { type integer }
+	type hooks
+	slave.pcm {
+		type hw
+		card $CARD
+		device $DEVICE
+	}
+	hooks.0 {
+		type ctl_elems
+		hook_args [
+			{
+				interface MIXER
+				name "IEC958 Playback Default"
+				lock true
+				preserve true
+				optional true
+				value [ $AES0 $AES1 $AES2 $AES3 ]
+			}
+		]
+	}
+	hint.device $DEVICE
+}
+
+simple-card.pcm.hdmi.0 {
+	@args [ CARD AES0 AES1 AES2 AES3 ]
+	@args.CARD { type string }
+	@args.AES0 { type integer }
+	@args.AES1 { type integer }
+	@args.AES2 { type integer }
+	@args.AES3 { type integer }
+
+	@func refer
+	name {
+		@func concat
+		strings [
+			"cards.simple-card.pcm.hdmi."
+			{ @func card_name card $CARD }
+			":CARD=" $CARD ","
+			"DEVICE=0,"
+			"AES0=" $AES0 ","
+			"AES1=" $AES1 ","
+			"AES2=" $AES2 ","
+			"AES3=" $AES3
+		]
+	}
+	default {
+		# point to non-existent device
+		card $CARD
+		device 999
+		hint.device 999
+	}
+
+}
+
+#
+# Configuration for SPDIF
+#
+
+<confdir:pcm/iec958.conf>
+
+simple-card.pcm.iec958."sun50i-h6-spdif" {
+	@args [ CARD DEVICE AES0 AES1 AES2 AES3 ]
+	@args.CARD { type string }
+	@args.DEVICE { type integer }
+	@args.AES0 { type integer }
+	@args.AES1 { type integer }
+	@args.AES2 { type integer }
+	@args.AES3 { type integer }
+	type hooks
+	slave.pcm {
+		type hw
+		card $CARD
+		device $DEVICE
+	}
+	hooks.0 {
+		type ctl_elems
+		hook_args [
+			{
+				interface MIXER
+				name "IEC958 Playback Default"
+				lock true
+				preserve true
+				optional true
+				value [ $AES0 $AES1 $AES2 $AES3 ]
+			}
+		]
+	}
+	hint.device $DEVICE
+}
+
+simple-card.pcm.iec958.0 {
+	@args [ CARD AES0 AES1 AES2 AES3 ]
+	@args.CARD { type string }
+	@args.AES0 { type integer }
+	@args.AES1 { type integer }
+	@args.AES2 { type integer }
+	@args.AES3 { type integer }
+	@func refer
+	name {
+		@func concat
+		strings [
+			"cards.simple-card.pcm.iec958."
+			{ @func card_name card $CARD }
+			":CARD=" $CARD ","
+			"DEVICE=0,"
+			"AES0=" $AES0 ","
+			"AES1=" $AES1 ","
+			"AES2=" $AES2 ","
+			"AES3=" $AES3
+		]
+	}
+	default {
+		# point to non-existent device
+		card $CARD
+		device 999
+		hint.device 999
+	}
+}