From 99f5924d4770dd77cb3bb6896ccc33ed3bbc9c9f Mon Sep 17 00:00:00 2001
From: Caleb Connolly <caleb@connolly.tech>
Date: Sat, 10 Apr 2021 22:58:59 +0100
Subject: [PATCH] device-oneplus-fajita: osk-sdl support and cleanup (MR 2088)

Make needed deviceinfo changes to support osk-sdl, add "quiet" to the
cmdline and bump the package version to 1.

Signed-off-by: Caleb Connolly <caleb@connolly.tech>
[ci:skip-vercheck]
---
 device/community/device-oneplus-fajita/APKBUILD   | 6 +++---
 device/community/device-oneplus-fajita/deviceinfo | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/device/community/device-oneplus-fajita/APKBUILD b/device/community/device-oneplus-fajita/APKBUILD
index bc88b5ef8..6c7c99126 100644
--- a/device/community/device-oneplus-fajita/APKBUILD
+++ b/device/community/device-oneplus-fajita/APKBUILD
@@ -3,8 +3,8 @@
 
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=0.3
-pkgrel=1
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -34,5 +34,5 @@ phosh() {
 		"$subpkgdir"/etc/phosh/rootston.ini
 }
 
-sha512sums="25bf602f9cb312580f6556fcbfcf4bf90bbcf96fae542054edfddf646cc6bc6031e424327723cb8fc2062966c259062e19f1d15086e3443caf93a22690730044  deviceinfo
+sha512sums="034def213ac5720be477251f9ba1ece31b733716f8372cdb58e36d405f0a4d651abb5943fd9d5fb55c20c8dcaac4398372ddace863a4cae589bb62e3599af453  deviceinfo
 035f97e328ff9f976b082e66b97f76036cdee9825f3022471c7c5d371291cc4b5bd5c18196cd49f4cd9ad6390abe691b506de3b221e3c122433d5620e3b3c4c9  rootston.ini"
diff --git a/device/community/device-oneplus-fajita/deviceinfo b/device/community/device-oneplus-fajita/deviceinfo
index ec1dda002..9acf27fbc 100644
--- a/device/community/device-oneplus-fajita/deviceinfo
+++ b/device/community/device-oneplus-fajita/deviceinfo
@@ -6,7 +6,6 @@ deviceinfo_name="OnePlus 6T"
 deviceinfo_manufacturer="OnePlus"
 deviceinfo_codename="oneplus-fajita"
 deviceinfo_year="2018"
-deviceinfo_modules_initfs=""
 deviceinfo_arch="aarch64"
 
 # Device related
@@ -18,7 +17,7 @@ deviceinfo_screen_height="2340"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_kernel_cmdline="quiet"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
@@ -36,3 +35,7 @@ deviceinfo_append_dtb="true"
 
 # Required for devices using UFS as storage (instead of e.g. eMMC)
 deviceinfo_rootfs_image_sector_size="4096"
+
+# osk-sdl
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c pmi8998_fg"
+deviceinfo_mesa_driver="msm"