From 7e43e9aba7c0e7003737b382bcc54b5260463caf Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Tue, 2 Aug 2022 23:13:28 +0300
Subject: [PATCH] oneplus-cheeseburger: add support for alpine-edge kernel (MR
 3336)

Adds Alpine's linux-edge as a kernel for the OnePlus 5.
---
 .../device-oneplus-cheeseburger/APKBUILD       | 17 ++++++++++++-----
 .../device-oneplus-cheeseburger/deviceinfo     | 18 +++++++++++-------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/device/testing/device-oneplus-cheeseburger/APKBUILD b/device/testing/device-oneplus-cheeseburger/APKBUILD
index d268c46e6..6dd76c025 100644
--- a/device/testing/device-oneplus-cheeseburger/APKBUILD
+++ b/device/testing/device-oneplus-cheeseburger/APKBUILD
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-oneplus-cheeseburger
 pkgdesc="OnePlus 5"
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -19,6 +19,7 @@ source="
 	phoc.ini
 "
 subpackages="
+	$pkgname-kernel-alpine:kernel_alpine
 	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-phosh
@@ -32,9 +33,15 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+kernel_alpine() {
+	pkgdesc="Pure mainline kernel, unpatched Alpine linux-edge"
+	depends="linux-edge linux-firmware-none"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 kernel_mainline() {
-	pkgdesc="Close to mainline kernel"
-	# soc-qcom-sdm845 is also applicable to msm8998
+	pkgdesc="Close to mainline kernel, plenty of working features and fixes"
+	# NOTE: soc-qcom-sdm845 is also applicable to msm8998
 	depends="linux-postmarketos-qcom-msm8998 soc-qcom-sdm845"
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
@@ -52,6 +59,6 @@ phosh() {
 }
 
 sha512sums="
-dfa270249998db3fe79dd0bb83359e0af9366fcc80fe8239ec3e1747deb3ad26fac04c0874daaf1258d70885a1720120d79b84bc35fe1b0f04c2c8dffca3fdea  deviceinfo
+a5c0a7bf014f39c4f8ae06148eb2331f937d3075518e34d09fe5d8c48bc0fd13af7eb67dc33567073c78667a1fa9f2121d9ef9648e8f041f8342f00cc6233e4e  deviceinfo
 2288f08a44aae5136c0c0c846501c2bd4bcb10f05454b40c6e4490d398385b8a7129216047b5eb7982ca6d62d3aa71f3e18bfb8661d0cd32c8a600685ca0da48  phoc.ini
 "
diff --git a/device/testing/device-oneplus-cheeseburger/deviceinfo b/device/testing/device-oneplus-cheeseburger/deviceinfo
index 1155e7ef4..0d34577cb 100644
--- a/device/testing/device-oneplus-cheeseburger/deviceinfo
+++ b/device/testing/device-oneplus-cheeseburger/deviceinfo
@@ -32,13 +32,17 @@ deviceinfo_flash_sparse="true"
 # Required for devices using UFS as storage (instead of e.g. eMMC)
 deviceinfo_rootfs_image_sector_size="4096"
 
-# Mainline kernel options
-deviceinfo_dtb_mainline="qcom/msm8998-oneplus-cheeseburger"
-deviceinfo_append_dtb_mainline="true"
+# Common mainline kernel options
+deviceinfo_flash_kernel_on_update="true"
+deviceinfo_dtb="qcom/msm8998-oneplus-cheeseburger"
+deviceinfo_append_dtb="true"
+
+# Close to mainline kernel options
 # We need 'clk_ignore_unused' for now or we don't get graphics
 deviceinfo_kernel_cmdline_mainline="clk_ignore_unused quiet loglevel=5"
-deviceinfo_flash_kernel_on_update="true"
+deviceinfo_modules_initfs_mainline="panel-samsung-s6e3fc1 msm i2c-qup rmi_i2c qcom_fg qcom_spmi_haptics"
+deviceinfo_mesa_driver_mainline="msm"
 
-# Initramfs
-deviceinfo_modules_initfs_mainline="panel-samsung-s6e3fa5 msm i2c-qup rmi_i2c qcom_fg qcom_spmi_haptics"
-deviceinfo_mesa_driver="msm"
+# Alpine kernel options
+deviceinfo_kernel_cmdline_alpine="PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_modules_initfs_alpine="fixed qcom_glink_rpm smd-rpm qcom_smd-regulator qcom-apcs-ipc-mailbox clk-qcom gcc-msm8998 phy-qcom-qmp phy-qcom-qusb2 configfs libcomposite udc-core dwc3 dwc3-qcom af_packet nvmem_qfprom spmi qcom-spmi-pmic qcom-pon governor_simpleondemand clk-smd-rpm ufs_qcom evdev i2c-qup bam_dma rmi_i2c"