From 5aefdbab0918a04420b9a49fd0719b8fe796d548 Mon Sep 17 00:00:00 2001
From: Konsta <konsta09@gmail.com>
Date: Sun, 12 Mar 2023 15:38:46 +0200
Subject: [PATCH] hdmi audio: remove local VC4 HDMI configuration

* This was updated in alsa-lib v1.2.7 so use the upstream config.
---
 audio/vc4-hdmi.conf | 68 ---------------------------------------------
 device.mk           |  2 +-
 2 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 audio/vc4-hdmi.conf

diff --git a/audio/vc4-hdmi.conf b/audio/vc4-hdmi.conf
deleted file mode 100644
index 7fbcb24..0000000
--- a/audio/vc4-hdmi.conf
+++ /dev/null
@@ -1,68 +0,0 @@
-# Configuration for the VC4-HDMI sound card using software IEC958
-# subframe conversion
-
-<confdir:pcm/hdmi.conf>
-vc4-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 iec958
-	slave {
-		format IEC958_SUBFRAME_LE
-		pcm {
-			type hooks
-			slave.pcm {
-				type hw
-				card $CARD
-				device 0
-			}
-			hooks.0 {
-				type ctl_elems
-				hook_args [
-				{
-					name "IEC958 Playback Default"
-					interface PCM
-					optional true
-					lock true
-					preserve true
-					value [ $AES0 $AES1 $AES2 $AES3 ]
-				}
-				]
-			}
-		}
-	}
-	status [ $AES0 $AES1 $AES2 $AES3 ]
-}
-
-# default with plug
-vc4-hdmi.pcm.default {
-	@args [ CARD ]
-	@args.CARD {
-		type string
-	}
-	type plug
-	slave.pcm {
-		type softvol
-		slave.pcm {
-			@func concat
-			strings [ "hdmi:" $CARD ]
-		}
-		control {
-			name "PCM Playback Volume"
-			card $CARD
-		}
-	}
-}
diff --git a/device.mk b/device.mk
index 5071883..05338d7 100644
--- a/device.mk
+++ b/device.mk
@@ -51,9 +51,9 @@ PRODUCT_PACKAGES += \
     alsa_loop
 
 PRODUCT_COPY_FILES += \
-    $(DEVICE_PATH)/audio/vc4-hdmi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/cards/vc4-hdmi.conf \
     external/alsa-lib/src/conf/alsa.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/alsa.conf \
     external/alsa-lib/src/conf/cards/aliases.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/cards/aliases.conf \
+    external/alsa-lib/src/conf/cards/vc4-hdmi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/cards/vc4-hdmi.conf \
     external/alsa-lib/src/conf/ctl/default.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/ctl/default.conf \
     external/alsa-lib/src/conf/pcm/center_lfe.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/center_lfe.conf \
     external/alsa-lib/src/conf/pcm/default.conf:$(TARGET_COPY_OUT_VENDOR)/etc/alsa/pcm/default.conf \