From ee581e5f16dcccfaf97a380fef689971188548b7 Mon Sep 17 00:00:00 2001
From: Yassine Oudjana <y.oudjana@protonmail.com>
Date: Sat, 22 May 2021 16:54:54 +0400
Subject: [PATCH] device-xiaomi-scorpio: update and move to community (MR 2188)

- Add SLPI to nonfree_firmware description
- Add touchscreen and fuel gauge modules to the initramfs in preparation for
  osk-sdl and charging-sdl (or any new alternative) support
- Add pointercal file for osk-sdl

[ci:skip-vercheck]
---
 .../device-xiaomi-scorpio/APKBUILD             | 18 +++++++++++++-----
 .../device-xiaomi-scorpio/deviceinfo           |  2 +-
 .../community/device-xiaomi-scorpio/pointercal |  1 +
 .../device-xiaomi-scorpio/rootston.ini         |  0
 4 files changed, 15 insertions(+), 6 deletions(-)
 rename device/{testing => community}/device-xiaomi-scorpio/APKBUILD (69%)
 rename device/{testing => community}/device-xiaomi-scorpio/deviceinfo (95%)
 create mode 100644 device/community/device-xiaomi-scorpio/pointercal
 rename device/{testing => community}/device-xiaomi-scorpio/rootston.ini (100%)

diff --git a/device/testing/device-xiaomi-scorpio/APKBUILD b/device/community/device-xiaomi-scorpio/APKBUILD
similarity index 69%
rename from device/testing/device-xiaomi-scorpio/APKBUILD
rename to device/community/device-xiaomi-scorpio/APKBUILD
index 9fd4991fe..618c2ae28 100644
--- a/device/testing/device-xiaomi-scorpio/APKBUILD
+++ b/device/community/device-xiaomi-scorpio/APKBUILD
@@ -3,8 +3,8 @@
 
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -21,6 +21,7 @@ subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
 
 source="
 	deviceinfo
+	pointercal
 	rootston.ini
 	"
 
@@ -30,10 +31,13 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
+
+	install -D -m644 "$srcdir"/pointercal \
+		"$pkgdir"/etc/pointercal
 }
 
 nonfree_firmware() {
-	pkgdesc="GPU/Modem/Venus/ADSP/WiFi/Bluetooth Firmware"
+	pkgdesc="GPU/Modem/Venus/ADSP/SLPI/WiFi/Bluetooth Firmware"
 	depends="
 		firmware-xiaomi-scorpio
 		linux-firmware-ath10k
@@ -49,5 +53,9 @@ phosh() {
 		"$subpkgdir"/etc/phosh/rootston.ini
 }
 
-sha512sums="554b9e3d0059afd0a60b57294b6587d0a624e92ff5ee51e79a116659ee75f79564bdc7736739199dd992ddb6b20418226cc0070dadae5ef6dffebf890c837431  deviceinfo
-035f97e328ff9f976b082e66b97f76036cdee9825f3022471c7c5d371291cc4b5bd5c18196cd49f4cd9ad6390abe691b506de3b221e3c122433d5620e3b3c4c9  rootston.ini"
+
+sha512sums="
+beb3df225722e32ff3bcd99b98813dd3815804fb24073806e7bfc5b2da567791b82674e995163e1376374016f36a5b27d9a62570a2f038c331da2fab7bd5ee30  deviceinfo
+e9ee9c1404b41ba15eafff3f728ff6e0e78dc17e9a88483fca92db1aa3efe0e4d5bf26142e533c4ff12b1bf8ce04ccabb7ca0f93aaea586d5b30910282aad237  pointercal
+035f97e328ff9f976b082e66b97f76036cdee9825f3022471c7c5d371291cc4b5bd5c18196cd49f4cd9ad6390abe691b506de3b221e3c122433d5620e3b3c4c9  rootston.ini
+"
diff --git a/device/testing/device-xiaomi-scorpio/deviceinfo b/device/community/device-xiaomi-scorpio/deviceinfo
similarity index 95%
rename from device/testing/device-xiaomi-scorpio/deviceinfo
rename to device/community/device-xiaomi-scorpio/deviceinfo
index 9d25278b8..35410b333 100644
--- a/device/testing/device-xiaomi-scorpio/deviceinfo
+++ b/device/community/device-xiaomi-scorpio/deviceinfo
@@ -8,7 +8,7 @@ deviceinfo_codename="xiaomi-scorpio"
 deviceinfo_year="2016"
 deviceinfo_dtb="qcom/msm8996-xiaomi-scorpio"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs=""
+deviceinfo_modules_initfs="qcom_fg atmel_mxt_ts"
 deviceinfo_arch="aarch64"
 
 # Device related
diff --git a/device/community/device-xiaomi-scorpio/pointercal b/device/community/device-xiaomi-scorpio/pointercal
new file mode 100644
index 000000000..478bad446
--- /dev/null
+++ b/device/community/device-xiaomi-scorpio/pointercal
@@ -0,0 +1 @@
+38332 -97 -1987162 -902 117510 2078835 65536 1080 1920 0
\ No newline at end of file
diff --git a/device/testing/device-xiaomi-scorpio/rootston.ini b/device/community/device-xiaomi-scorpio/rootston.ini
similarity index 100%
rename from device/testing/device-xiaomi-scorpio/rootston.ini
rename to device/community/device-xiaomi-scorpio/rootston.ini