From 2cb88d5c6da2c47c9443a7cbe5fc129fc52f1a87 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@lucaweiss.eu>
Date: Mon, 8 Sep 2025 13:43:21 +0200
Subject: [PATCH] firmware-fairphone-fp3: remove compat symlinks, add audio amp
 firmware

The symlinks are not needed anymore with the newest kernel, so clean
them up.

And package up the aw8898_cfg.bin firmware/config file for Fairphone 3.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7010>
---
 .../testing/firmware-fairphone-fp3/APKBUILD   | 32 ++++++-------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/device/testing/firmware-fairphone-fp3/APKBUILD b/device/testing/firmware-fairphone-fp3/APKBUILD
index 2bf7680f8..6bfe50104 100644
--- a/device/testing/firmware-fairphone-fp3/APKBUILD
+++ b/device/testing/firmware-fairphone-fp3/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=firmware-fairphone-fp3
 pkgver=20210805
 _commit="ee529820bb874ab1b52873f0b144c3786f01ee4c"
-pkgrel=2
+pkgrel=3
 pkgdesc="Firmware for Fairphone 3"
 url="https://github.com/FairBlobs/FP3-firmware"
 arch="aarch64"
@@ -11,6 +11,7 @@ makedepends="pil-squasher"
 subpackages="
 	$pkgname-adreno
 	$pkgname-adsp
+	$pkgname-audio
 	$pkgname-modem
 	$pkgname-venus
 	$pkgname-wcnss
@@ -34,9 +35,6 @@ adreno() {
 
 	install -Dm644 "$builddir"/a506_zap.mbn -t \
 		"$subpkgdir/lib/firmware/qcom/msm8953/fairphone/fp3"
-
-	ln -s a506_zap.mbn \
-		"$subpkgdir/lib/firmware/qcom/msm8953/fairphone/fp3/a506_zap.mdt"
 }
 
 adsp() {
@@ -44,10 +42,14 @@ adsp() {
 
 	install -Dm644 "$builddir"/adsp.mbn -t \
 		"$subpkgdir/lib/firmware/qcom/msm8953/fairphone/fp3"
+}
 
-	mkdir -p "$subpkgdir/lib/firmware/postmarketos"
-	ln -s ../qcom/msm8953/fairphone/fp3/adsp.mbn \
-		"$subpkgdir/lib/firmware/postmarketos/adsp.mdt"
+audio() {
+	pkgdesc="Fairphone 3 firmware for the audio amplifier"
+
+	# TODO: More generic path
+	install -Dm644 "$builddir"/aw8898_cfg.bin -t \
+		"$subpkgdir/lib/firmware/postmarketos"
 }
 
 modem() {
@@ -57,12 +59,6 @@ modem() {
 		"$subpkgdir/lib/firmware/qcom/msm8953/fairphone/fp3"
 	install -Dm644 "$builddir"/modem.mbn -t \
 		"$subpkgdir/lib/firmware/qcom/msm8953/fairphone/fp3"
-
-	mkdir -p "$subpkgdir/lib/firmware/postmarketos"
-	ln -s ../qcom/msm8953/fairphone/fp3/mba.mbn \
-		"$subpkgdir/lib/firmware/postmarketos/mba.mbn"
-	ln -s ../qcom/msm8953/fairphone/fp3/modem.mbn \
-		"$subpkgdir/lib/firmware/postmarketos/modem.mdt"
 }
 
 venus() {
@@ -70,10 +66,6 @@ venus() {
 
 	install -Dm644 "$builddir"/venus.mbn -t \
 		"$subpkgdir/lib/firmware/qcom/msm8953/fairphone/fp3"
-
-	mkdir -p "$subpkgdir/lib/firmware/postmarketos"
-	ln -s ../qcom/msm8953/fairphone/fp3/venus.mbn \
-		"$subpkgdir/lib/firmware/postmarketos/venus.mdt"
 }
 
 wcnss() {
@@ -83,12 +75,6 @@ wcnss() {
 		"$subpkgdir/lib/firmware/qcom/msm8953/fairphone/fp3"
 	install -Dm644 "$builddir"/wlan/prima/WCNSS_qcom_wlan_nv.bin -t \
 		"$subpkgdir/lib/firmware/qcom/msm8953/fairphone/fp3"
-
-	mkdir -p "$subpkgdir/lib/firmware/postmarketos/wlan/prima"
-	ln -s ../qcom/msm8953/fairphone/fp3/wcnss.mbn \
-		"$subpkgdir/lib/firmware/postmarketos/wcnss.mdt"
-	ln -s ../../../qcom/msm8953/fairphone/fp3/WCNSS_qcom_wlan_nv.bin \
-		"$subpkgdir/lib/firmware/postmarketos/wlan/prima/WCNSS_qcom_wlan_nv.bin"
 }
 
 sha512sums="