From 22a9cdf7b27ea274d9ba25e8d5401fd2208d0abf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= <trabarni@gmail.com>
Date: Sat, 9 Mar 2024 13:05:16 +0100
Subject: [PATCH] device-xiaomi-lavender: add necessary depedencies for modem,
 wifi and gpu (MR 4897)

Add msm-firmware-loader, soc-qcom-sdm660-rproc, firmware-xiaomi-lavender
and firmware-qcom-adreno-a530 as dependency. This is necessary to make
Wi-Fi and modem work.
Add support for panel drivers.
---
 .../testing/device-xiaomi-lavender/APKBUILD   | 38 ++++++++++++++++---
 .../testing/device-xiaomi-lavender/deviceinfo |  5 ++-
 .../device-xiaomi-lavender/modules-initfs.boe |  2 +
 .../{modules-initfs => modules-initfs.tianma} |  1 +
 4 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 device/testing/device-xiaomi-lavender/modules-initfs.boe
 rename device/testing/device-xiaomi-lavender/{modules-initfs => modules-initfs.tianma} (66%)

diff --git a/device/testing/device-xiaomi-lavender/APKBUILD b/device/testing/device-xiaomi-lavender/APKBUILD
index c3798cbdf..08a013b22 100644
--- a/device/testing/device-xiaomi-lavender/APKBUILD
+++ b/device/testing/device-xiaomi-lavender/APKBUILD
@@ -2,15 +2,31 @@
 # Maintainer: Alexey Min <alexey.min@gmail.com>
 pkgname=device-xiaomi-lavender
 pkgdesc="Xiaomi Redmi Note 7"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="linux-postmarketos-qcom-sdm660 mkbootimg postmarketos-base"
+depends="
+	firmware-xiaomi-lavender
+	firmware-qcom-adreno-a530
+	mkbootimg
+	msm-firmware-loader
+	postmarketos-base
+	soc-qcom-sdm660
+	soc-qcom-sdm660-rproc
+"
 makedepends="devicepkg-dev"
-source="deviceinfo modules-initfs"
+subpackages="
+	$pkgname-kernel-boe:kernel_boe
+	$pkgname-kernel-tianma:kernel_tianma
+"
+source="
+	deviceinfo
+	modules-initfs.boe
+	modules-initfs.tianma
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -20,7 +36,19 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+kernel_boe() {
+	pkgdesc="For Redmi Note 7 with BOE panel"
+	depends="linux-postmarketos-qcom-sdm660"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_tianma() {
+	pkgdesc="For Redmi Note 7 with Tianma panel"
+	depends="linux-postmarketos-qcom-sdm660"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
 sha512sums="
-eab75a375ba212afea4c7cdc0754d3eac6b7bb1631d3d98c992c84f3520edfd4abe9861e110cb9d797faf7a516d3dd0f1558b70623391745efe920739e58e6f6  deviceinfo
-029156e04ee0f9e20cf37d6fd0f52278ecc6a029b9ca86845a5e9a7b550ed1211b62f09e5ed36083061269d4e83b648788b87bbde0fba3cd1eb68675c47b79eb  modules-initfs
+b566c8bb8c38bca4313cef769e189be8eff8c53d1fb6cc7ec299e076595c13ea97ccca9af26b38c39ee30f15521d9d3aea97172dab4e00223f12175ad667f697  deviceinfo
+77f0b637ca0d6512da7964425c08f0b8c2d8ac40b784301055fc70769d15989713388dd098ee9ee89520a52ead96283f9898da6d87b6e0e70143ce5859f9b61b  modules-initfs.boe
+2985ce67fe3a5cd4cd03c9c5e7af072174775a97b4d26c40b025a82b33fead69f7cb4ac185db1b7b97d61b02ebdf56c88f77f55d2dd352ac2d7e47394563dbe2  modules-initfs.tianma
 "
diff --git a/device/testing/device-xiaomi-lavender/deviceinfo b/device/testing/device-xiaomi-lavender/deviceinfo
index 902030e63..f1c69e2ce 100644
--- a/device/testing/device-xiaomi-lavender/deviceinfo
+++ b/device/testing/device-xiaomi-lavender/deviceinfo
@@ -6,11 +6,14 @@ deviceinfo_name="Xiaomi Redmi Note 7"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-lavender"
 deviceinfo_year="2019"
-deviceinfo_dtb="qcom/sdm660-xiaomi-lavender"
+deviceinfo_dtb_boe="qcom/sdm660-xiaomi-lavender-boe"
+deviceinfo_dtb_tianma="qcom/sdm660-xiaomi-lavender-tianma"
 deviceinfo_append_dtb="true"
 deviceinfo_arch="aarch64"
+deviceinfo_flash_kernel_on_update="true"
 
 # Device related
+deviceinfo_gpu_accelerated="true"
 deviceinfo_chassis="handset"
 deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
diff --git a/device/testing/device-xiaomi-lavender/modules-initfs.boe b/device/testing/device-xiaomi-lavender/modules-initfs.boe
new file mode 100644
index 000000000..6fba1cebc
--- /dev/null
+++ b/device/testing/device-xiaomi-lavender/modules-initfs.boe
@@ -0,0 +1,2 @@
+msm
+panel-boe-td4320
diff --git a/device/testing/device-xiaomi-lavender/modules-initfs b/device/testing/device-xiaomi-lavender/modules-initfs.tianma
similarity index 66%
rename from device/testing/device-xiaomi-lavender/modules-initfs
rename to device/testing/device-xiaomi-lavender/modules-initfs.tianma
index 1d20c0e9d..b804ddd7c 100644
--- a/device/testing/device-xiaomi-lavender/modules-initfs
+++ b/device/testing/device-xiaomi-lavender/modules-initfs.tianma
@@ -1 +1,2 @@
+msm
 nt36xxx