From 114420bb05a8823ee919239eb92a874381b8a665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= <trabarni@gmail.com>
Date: Tue, 3 Oct 2023 00:30:33 +0200
Subject: [PATCH] xiaomi-onclite: depend on soc-qcom-msm8953 modem and
 initramfs subpackages (MR 4445)

Depend on soc-qcom-msm8953-modem and initramfs.
Add necessary modules to initfs for fix touchscreen under fde.

[ci:skip-build]: already built successfully in CI
---
 device/testing/device-xiaomi-onclite/APKBUILD | 23 +++++++++----------
 .../device-xiaomi-onclite/modules-initfs      |  2 ++
 .../30-gpu-firmware.files                     |  4 ----
 .../testing/firmware-xiaomi-onclite/APKBUILD  | 23 ++++++-------------
 4 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 device/testing/firmware-xiaomi-onclite/30-gpu-firmware.files

diff --git a/device/testing/device-xiaomi-onclite/APKBUILD b/device/testing/device-xiaomi-onclite/APKBUILD
index 368b15862..bf401f78d 100644
--- a/device/testing/device-xiaomi-onclite/APKBUILD
+++ b/device/testing/device-xiaomi-onclite/APKBUILD
@@ -3,8 +3,8 @@
 
 pkgname=device-xiaomi-onclite
 pkgdesc="Xiaomi Redmi 7"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -18,7 +18,7 @@ depends="
 "
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-modem"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -29,18 +29,17 @@ package() {
 }
 
 nonfree_firmware() {
-	pkgdesc="Modem, WiFi, BT, ADSP, Venus and GPU Firmware, also needed for osk-sdl"
-	depends="msm-firmware-loader firmware-xiaomi-onclite"
-	mkdir "$subpkgdir"
-}
-
-modem() {
-	depends="qrtr rmtfs rmtfs-openrc msm-modem-uim-selection"
-	install_if="$pkgname=$pkgver-r$pkgrel $pkgname-nonfree-firmware"
+	pkgdesc="Modem, WiFi, BT, ADSP, Venus and GPU Firmware"
+	depends="
+		firmware-xiaomi-onclite
+		msm-firmware-loader
+		soc-qcom-msm8953-initramfs
+		soc-qcom-msm8953-modem
+	"
 	mkdir "$subpkgdir"
 }
 
 sha512sums="
 f034295150acd176b9e9afe1936778d977cc220a9980e2081df3de7aa6705b2b0e86eaacdc84290b204729d5e3b8c23da71c41fc8a972519a8a0aa4e41d3599d  deviceinfo
-c937f5fd7f11cccd7629d306b46a7f3aa3503c8eaaa3280b0f5a97473f6f430ba822110ada34a8eb95e798604916ba7e1170cb2217bbff72b0f738b02aa3f412  modules-initfs
+3a0f899046100af92be967043c595eb517cd54b4147e151d659c7f283c238565473c16eb43e223624233695559c01c17d29942153ef2f28c6e52695617e6ab2d  modules-initfs
 "
diff --git a/device/testing/device-xiaomi-onclite/modules-initfs b/device/testing/device-xiaomi-onclite/modules-initfs
index 0a1df893f..3b075721a 100644
--- a/device/testing/device-xiaomi-onclite/modules-initfs
+++ b/device/testing/device-xiaomi-onclite/modules-initfs
@@ -1,3 +1,5 @@
+bam_dma
+edt_ft5x06
 msm
 panel_xiaomi_onclite_hx8394f
 panel_xiaomi_onclite_ili9881
diff --git a/device/testing/firmware-xiaomi-onclite/30-gpu-firmware.files b/device/testing/firmware-xiaomi-onclite/30-gpu-firmware.files
deleted file mode 100644
index fd4eab9b7..000000000
--- a/device/testing/firmware-xiaomi-onclite/30-gpu-firmware.files
+++ /dev/null
@@ -1,4 +0,0 @@
-/lib/firmware/postmarketos/a506_zap.b02
-/lib/firmware/postmarketos/a506_zap.mdt
-/lib/firmware/postmarketos/a530_pfp.fw
-/lib/firmware/postmarketos/a530_pm4.fw
diff --git a/device/testing/firmware-xiaomi-onclite/APKBUILD b/device/testing/firmware-xiaomi-onclite/APKBUILD
index ab6be5875..cc106553e 100644
--- a/device/testing/firmware-xiaomi-onclite/APKBUILD
+++ b/device/testing/firmware-xiaomi-onclite/APKBUILD
@@ -1,36 +1,27 @@
 # Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=firmware-xiaomi-onclite
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware files for Xiaomi Redmi 7"
 url="https://gitlab.com/barni2000/$pkgname"
 arch="aarch64"
-depends="firmware-xiaomi-onclite-initramfs"
 license="proprietary"
 options="!strip !check !archcheck !spdx !tracedeps pmb:cross-native"
 
 _commit="5ab4968ab12acb60a5e165008fdf25345e80c309"
 
-source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz
-	30-gpu-firmware.files"
-subpackages="$pkgname-initramfs:firmware_initramfs"
+source="$pkgname-$_commit.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit"
 
-_fwdir="/lib/firmware/postmarketos"
+_fwdir="/lib/firmware"
 
 package() {
-	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir"
-	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir"
-	install -Dm644 a530_pfp.fw -t "$pkgdir/$_fwdir"
-	install -Dm644 a530_pm4.fw -t "$pkgdir/$_fwdir"
-}
-
-firmware_initramfs() {
-	install -Dm644 "$srcdir"/30-gpu-firmware.files -t \
-		"$subpkgdir"/usr/share/mkinitfs/files
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir/postmarketos"
+	install -Dm644 a530_pfp.fw -t "$pkgdir/$_fwdir/qcom"
+	install -Dm644 a530_pm4.fw -t "$pkgdir/$_fwdir/qcom"
 }
 
 sha512sums="
 e95cf73b4a2e13c8ea3296670177372f5e3c07f40e73806546f7c28a12a3ba5a3b735994dcaeacb8da59f5e3561ab6b061cedd77757cf58686907d32b1a7162a  firmware-xiaomi-onclite-5ab4968ab12acb60a5e165008fdf25345e80c309.tar.gz
-0e7daa7d3fb216b4949e103a6a58af614b6dd6839acd5e638a2cd6b4caf703fa0d19b2dfb997f69a097e3653c31da22fa1a289fbf911b6ecb1f3b1a901ef33d3  30-gpu-firmware.files
 "