From 6e8f2daed254adeb28c18709afcdca4ce75e3e9a Mon Sep 17 00:00:00 2001
From: alikates <alikatees@protonmail.com>
Date: Tue, 14 Sep 2021 12:05:04 +0200
Subject: [PATCH] device-xiaomi-daisy: Add mainline modem support, fix scaling
 and deviceinfo cleanup (MR 2496)

---
 device/testing/device-xiaomi-daisy/APKBUILD   | 23 ++++++++++++++++---
 device/testing/device-xiaomi-daisy/deviceinfo | 11 ++++++---
 .../testing/device-xiaomi-daisy/rootston.ini  |  5 ++++
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 device/testing/device-xiaomi-daisy/rootston.ini

diff --git a/device/testing/device-xiaomi-daisy/APKBUILD b/device/testing/device-xiaomi-daisy/APKBUILD
index e17efc21b..cad224e2a 100644
--- a/device/testing/device-xiaomi-daisy/APKBUILD
+++ b/device/testing/device-xiaomi-daisy/APKBUILD
@@ -3,8 +3,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-xiaomi-daisy
 pkgdesc="Xiaomi Mi A2 Lite"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,12 +15,15 @@ subpackages="
 		$pkgname-nonfree-firmware:nonfree_firmware
 		$pkgname-kernel-downstream:kernel_downstream
 		$pkgname-kernel-mainline:kernel_mainline
+		$pkgname-phosh
+		$pkgname-modem
 		"
 source="
 	deviceinfo
 	fb.modes
 	pointercal
 	30-gpu-firmware.files
+	rootston.ini
 	"
 
 build() {
@@ -52,9 +55,23 @@ kernel_mainline() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
+modem() {
+	depends="qrtr rmtfs rmtfs-openrc msm-modem-uim-selection"
+	install_if="$pkgname=$pkgver-r$pkgrel $pkgname-nonfree-firmware"
+	mkdir "$subpkgdir"
+}
+
+phosh() {
+	install_if="$pkgname=$pkgver-r$pkgrel phosh"
+	mkdir "$subpkgdir"
+	install -Dm644 "$srcdir"/rootston.ini \
+		"$subpkgdir"/etc/phosh/rootston.ini
+}
+
 sha512sums="
-63c641e242fd878ec85deb8ff0c7e2bbc9fc26fdaae4c2e2d91416116a1a4aadb86f012ee08110565001484c04629d9571948399508b95a85ae1cb4fbe2f9ff5  deviceinfo
+3ee2d46cb2559ada99c1536608b28dc98b9da65ac3990d512e6d65e4a64190127fd9d6949dbe5515cddfcf85d226d710b9c336b3f198b9f93c0f683f2f24d918  deviceinfo
 9b888f3a4ef3ed3c0b2e9c6a6e8a6c686909c530c3d95be797b47b4eb9deb55d64190b7a3736e44139630bfff5e295625a855052923369fdd37889060a3220ca  fb.modes
 4fa63c184f00033fbae2e4b140c9655061b3b662e337f7bdf5f8e26f7b57d6c66ad01fc93da05ce7d330f0f05bb0d36cc9b356ebfc7eb4200be4d4cc03afc975  pointercal
 302c0bec754bb79ef561c1a8d4ff34ba52b904c853bce6a15a79ba7b5b7a3d02c1c75bbe86d59be7b608a6dc744dd3e3c638eaa4539c53d20fa55fa5ea397d74  30-gpu-firmware.files
+035f97e328ff9f976b082e66b97f76036cdee9825f3022471c7c5d371291cc4b5bd5c18196cd49f4cd9ad6390abe691b506de3b221e3c122433d5620e3b3c4c9  rootston.ini
 "
diff --git a/device/testing/device-xiaomi-daisy/deviceinfo b/device/testing/device-xiaomi-daisy/deviceinfo
index 8c790b021..598bae3a3 100644
--- a/device/testing/device-xiaomi-daisy/deviceinfo
+++ b/device/testing/device-xiaomi-daisy/deviceinfo
@@ -6,12 +6,18 @@ deviceinfo_name="Xiaomi Mi A2 Lite"
 deviceinfo_manufacturer="Xiaomi"
 deviceinfo_codename="xiaomi-daisy"
 deviceinfo_year="2018"
+deviceinfo_arch="aarch64"
+
+# Mainline
 deviceinfo_dtb_mainline="qcom/sdm625-xiaomi-daisy"
 deviceinfo_append_dtb_mainline="true"
-deviceinfo_append_dtb_downstream="false"
-deviceinfo_arch="aarch64"
+deviceinfo_modules_initfs_mainline="edt_ft5x06"
+deviceinfo_gpu_accelerated="true"
 deviceinfo_mesa_driver="msm"
 
+# Downstream
+deviceinfo_append_dtb_downstream="false"
+
 # Device related
 deviceinfo_chassis="handset"
 deviceinfo_keyboard="false"
@@ -36,4 +42,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_sparse=true
-deviceinfo_weston_core_modules="xwayland.so"
diff --git a/device/testing/device-xiaomi-daisy/rootston.ini b/device/testing/device-xiaomi-daisy/rootston.ini
new file mode 100644
index 000000000..9a6e8784c
--- /dev/null
+++ b/device/testing/device-xiaomi-daisy/rootston.ini
@@ -0,0 +1,5 @@
+# /etc/phosh/rootston.ini
+# Overwrites values set in /usr/share/phosh/phoc.ini
+
+[output:DSI-1]
+scale = 2.5