From f8da0d6d3ba8f964e86eb356b4d21392442e8cac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= <git@apitzsch.eu>
Date: Mon, 22 Jan 2024 23:06:00 +0100
Subject: [PATCH] device-motorola-peregrine: add mainline kernel configuration
 (MR 4753)

[ci:skip-build]: Already built successfully in CI.
---
 .../device-motorola-peregrine/APKBUILD        | 36 +++++++++++++++----
 .../device-motorola-peregrine/deviceinfo      |  6 ++--
 .../modules-initfs.mainline                   |  2 ++
 3 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 device/testing/device-motorola-peregrine/modules-initfs.mainline

diff --git a/device/testing/device-motorola-peregrine/APKBUILD b/device/testing/device-motorola-peregrine/APKBUILD
index 4b43a4113..acf4f8da4 100644
--- a/device/testing/device-motorola-peregrine/APKBUILD
+++ b/device/testing/device-motorola-peregrine/APKBUILD
@@ -1,16 +1,25 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-peregrine
 pkgdesc="Moto G 4G (2013)"
-pkgver=0.1
-pkgrel=17
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-motorola-peregrine mkbootimg msm-fb-refresher"
+depends="mkbootimg postmarketos-base"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware device-motorola-peregrine-x11"
-source="deviceinfo xorg.conf"
+subpackages="
+	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-x11
+	"
+source="
+	deviceinfo
+	xorg.conf
+	modules-initfs.mainline
+	"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -20,8 +29,20 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+kernel_downstream() {
+	pkgdesc="Downstream kernel"
+	depends="linux-motorola-peregrine msm-fb-refresher"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="Close to mainline kernel"
+	depends="linux-postmarketos-qcom-msm8226"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 x11() {
-	install_if="$pkgname xorg-server"
+	install_if="$pkgname-kernel-downstream=$pkgver-r$pkgrel xorg-server"
 	depends="
 		libinput
 		xf86-input-libinput
@@ -37,6 +58,7 @@ nonfree_firmware() {
 }
 
 sha512sums="
-3786abab9d432103a83a05bc8af9e182d08ad613c350fd169dbd83a28ebe815b27e11993d09eed9450e3f9abf4872e6468db36763a459937a405cb56f43a1a5f  deviceinfo
+7ab781baeaae9dc8a87d52943c16f3875d290db0bd0855cbeccbfd45b08a98eab3f1f4071399cecd9bfd570fbcdb4f954a9c9b173f633e77458506e9e7ec3149  deviceinfo
 f86ef35730b89bcc8160c08db7a7fcd0970adf60c0b77af68bac397de49c0d1783e6b8db1762380c9bf874aff2d030c6f44ecb75c803d69e79ede11376409369  xorg.conf
+01b3f81f77732b7bc32e01e1c242a30f03b7c02da3aa830e3eb21b6f10458616cc8752d532405c66cd54f488c53962cf1901ebe30019ddcd572ea13445e6d28b  modules-initfs.mainline
 "
diff --git a/device/testing/device-motorola-peregrine/deviceinfo b/device/testing/device-motorola-peregrine/deviceinfo
index 90885576f..6e426f5e2 100644
--- a/device/testing/device-motorola-peregrine/deviceinfo
+++ b/device/testing/device-motorola-peregrine/deviceinfo
@@ -6,6 +6,8 @@ deviceinfo_name="Motorola Moto G 4G (2013)"
 deviceinfo_manufacturer="Motorola"
 deviceinfo_codename="motorola-peregrine"
 deviceinfo_year="2013"
+deviceinfo_dtb_mainline="qcom-msm8926-motorola-peregrine"
+deviceinfo_append_dtb_mainline="true"
 deviceinfo_arch="armv7"
 
 # Device related
@@ -18,9 +20,9 @@ deviceinfo_dev_touchscreen="/dev/input/event3"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="androidboot.bootdevice=msm_sdcc.1 androidboot.hardware=qcom vmalloc=400M androidboot.selinux=permissive"
+deviceinfo_kernel_cmdline_downstream="androidboot.bootdevice=msm_sdcc.1 androidboot.hardware=qcom vmalloc=400M androidboot.selinux=permissive"
 deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="true"
+deviceinfo_bootimg_qcdt_downstream="true"
 deviceinfo_flash_offset_base="0x10000000"
 deviceinfo_flash_offset_kernel="0x00008000"
 deviceinfo_flash_offset_ramdisk="0x01000000"
diff --git a/device/testing/device-motorola-peregrine/modules-initfs.mainline b/device/testing/device-motorola-peregrine/modules-initfs.mainline
new file mode 100644
index 000000000..0b9bc172e
--- /dev/null
+++ b/device/testing/device-motorola-peregrine/modules-initfs.mainline
@@ -0,0 +1,2 @@
+msm
+rmi_i2c