From 33657529262554c770447fab9ce10af35c6feeea Mon Sep 17 00:00:00 2001
From: dabao1955 <dabao1955@163.com>
Date: Sun, 7 Sep 2025 22:44:45 +0800
Subject: [PATCH] firmware-xiaomi-raphael: Fix wrong firmware path

This commit fixes some firmware not found by kernel requests.

before:
```
[    0.552689] goodix firmware update module init start
[    0.801269] goodix_i2c 2-005d: Direct firmware load for qcom/sm8150/Xiaomi/raphael/good failed with error -2
```

after:
```
[    0.152816] goodix firmware update module init start
[    0.597937] input: goodix_ts as /devices/platform/goodix_ts.0/input/input2
```

Signed-off-by: dabao1955 <dabao1955@163.com>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7011>
---
 .../30-gpu-firmware.files                     | 18 ++++++++---------
 .../testing/firmware-xiaomi-raphael/APKBUILD  | 20 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/device/testing/firmware-xiaomi-raphael/30-gpu-firmware.files b/device/testing/firmware-xiaomi-raphael/30-gpu-firmware.files
index 105d52af4..4e81d006d 100644
--- a/device/testing/firmware-xiaomi-raphael/30-gpu-firmware.files
+++ b/device/testing/firmware-xiaomi-raphael/30-gpu-firmware.files
@@ -1,9 +1,9 @@
-/lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_gmu.bin
-/lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.mbn
-/lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.b00
-/lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.b01
-/lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.b02
-/lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.elf
-/lib/firmware/qcom/sm8150/Xiaomi/raphael/a640_zap.mdt
-/lib/firmware/qcom/sm8150/Xiaomi/raphael/goodix_gt9886_cfg_f11.bin
-/lib/firmware/qcom/sm8150/Xiaomi/raphael/goodix_gt9886_fw_f11.bin
+/lib/firmware/qcom/a640_gmu.bin
+/lib/firmware/qcom/a640_zap.mbn
+/lib/firmware/qcom/a640_zap.b00
+/lib/firmware/qcom/a640_zap.b01
+/lib/firmware/qcom/a640_zap.b02
+/lib/firmware/qcom/a640_zap.elf
+/lib/firmware/qcom/a640_zap.mdt
+/lib/firmware/goodix_gt9886_cfg_f11.bin
+/lib/firmware/goodix_gt9886_fw_f11.bin
diff --git a/device/testing/firmware-xiaomi-raphael/APKBUILD b/device/testing/firmware-xiaomi-raphael/APKBUILD
index 6ae771955..aac26919e 100644
--- a/device/testing/firmware-xiaomi-raphael/APKBUILD
+++ b/device/testing/firmware-xiaomi-raphael/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=firmware-xiaomi-raphael
 pkgver=20240929
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for Xiaomi Mi 9T Pro / Redmi K20 Pro"
 arch="aarch64"
 _carch="arm64"
@@ -38,21 +38,21 @@ adreno() {
 	pkgdesc="Xiaomi raphael adreno firmware"
 	depends="firmware-qcom-adreno-a650"
 	install -Dm644 "$builddir"/sm8150/raphael/a6* -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
+		"$subpkgdir/lib/firmware/qcom/"
 }
 
 adsp() {
 	pkgdesc="Xiaomi raphael adsp firmware"
 
 	install -Dm644 "$builddir"/sm8150/raphael/adsp* -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
+		"$subpkgdir/lib/firmware/"
 }
 
 camera() {
 	pkgdesc="Xiaomi raphael camera firmware"
 
 	install -Dm644 "$builddir"/sm8150/raphael/CAMERA_ICP.elf -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
+		"$subpkgdir/lib/firmware/"
 }
 
 cdsp() {
@@ -72,7 +72,7 @@ modem() {
 	pkgdesc="Xiaomi raphael modem firmware"
 
 	install -Dm644 "$builddir"/sm8150/raphael/modem* -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
+		"$subpkgdir/lib/firmware/"
 }
 
 
@@ -86,23 +86,25 @@ touchscreen() {
 	pkgdesc="Xiaomi raphael touchscreen firmware"
 
 	install -Dm644 "$builddir"/sm8150/raphael/good* -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
+		"$subpkgdir/lib/firmware/"
 }
 
 venus() {
 	pkgdesc="Xiaomi raphael venus firmware"
 
 	install -Dm644 "$builddir"/sm8150/raphael/venus.mbn -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
+		"$subpkgdir/lib/firmware/"
 }
 
 wlan() {
 	pkgdesc="Xiaomi raphael wlan firmware"
 
 	install -Dm644 "$builddir"/sm8150/raphael/wlanmdsp.mbn -t \
-		"$subpkgdir/lib/firmware/qcom/sm8150/Xiaomi/raphael/"
+		"$subpkgdir/lib/firmware/"
 }
 
 sha512sums="
 6a0305e70ffb581b957e5b987048931d3900416753189e967d2f2a5a5826ab30a929ebbd6f79fb64a80c00cef5bc6583bbd1c6825044b03f5d6fc352f84e318b  89149ad98c7c8443946a518e9fb2ff2e2c83d54d.tar.gz
-cbfb62e7890e87d2dd06b54edb0df90904a62d6f6e34c48a86e784a6277f5472760ac7775b2feea91abbb30ba26fd810719250618b91b23a8913a759c681d6cb  30-gpu-firmware.files"
+db9c8e7e6de67a1c0ca853af138b7218e7451f767268f8ec1f7131c8ef179fdd8d85e6ebccae3ff715bfa6d9ad7ec1bcf2cc2554fe442bb74bd5ecf65e1096fc  30-gpu-firmware.files
+"
+