volla-mimameid: add support for close to mainline kernel (MR 3652)

[ci:skip-build] already built successfully in CI

device/testing/device-volla-mimameid/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
-
 pkgname=device-volla-mimameid
 pkgdesc="Volla Phone 22"
-pkgver=0.1
-pkgrel=1
+pkgver=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	linux-volla-mimameid
 	mkbootimg
-	msm-fb-refresher
 	postmarketos-base
 "
 makedepends="devicepkg-dev"
 source="deviceinfo"
+subpackages="
+	$pkgname-kernel-downstream:kernel_downstream
+	$pkgname-kernel-mainline:kernel_mainline
+"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -26,6 +27,18 @@ package() {
 	devicepkg_package $startdir $pkgname
 }
 
+kernel_downstream() {
+	pkgdesc="Downstream kernel"
+	depends="linux-volla-mimameid msm-fb-refresher"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_mainline() {
+	pkgdesc="Close to mainline kernel, heavily work in progress"
+	depends="linux-postmarketos-mediatek-mt6768"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 sha512sums="
-0a8ac9a10584d0473864581f0a18063ab29083c80b7f89383da507ddfe2d2deb680e16d8943b3dbf50e71c49bf4b98aa73584bfbb236a9655307af5f0438e5e4  deviceinfo
+c0c9d466253b17d7af8be38b8541b7fb363ba0ac51cf06232c940e61c5a653f2f663869f6b89015cc33f14b46fb4304d5d3cfa89554254684bd98786642883e4  deviceinfo
 "

device/testing/device-volla-mimameid/deviceinfo

 # Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
+# Please use double quotes only. You can source this file in shell scripts.
 deviceinfo_format_version="0"
 deviceinfo_name="Volla Phone 22"
 deviceinfo_manufacturer="Volla"
 deviceinfo_codename="volla-mimameid"
 deviceinfo_year="2022"
-deviceinfo_dtb="mediatek/mt6768"
 deviceinfo_arch="aarch64"
 
 # Device related
@@ -19,7 +16,6 @@ deviceinfo_screen_height="2340"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="bootopt=64S3,32N2,64N2"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"
@@ -36,6 +32,15 @@ deviceinfo_flash_offset_ramdisk="0x07c08000"
 deviceinfo_flash_offset_second="0x00e10000"
 deviceinfo_flash_offset_tags="0x0bc08000"
 
+# Downstream kernel related
+deviceinfo_dtb_downstream="mediatek/mt6768"
+deviceinfo_kernel_cmdline_downstream="bootopt=64S3,32N2,64N2"
+
+# Mainline kernel related
+deviceinfo_dtb_mainline="mediatek/mt6769z-volla-mimameid"
+deviceinfo_kernel_cmdline_mainline="bootopt=64S3,32N2,64N2 PMOS_NO_OUTPUT_REDIRECT"
+deviceinfo_flash_fastboot_partition_dtbo_mainline="dtbo"
+
 # NOTE: Flashing kernel on upgrades unsupported due to "dd: error writing
 # '/dev/disk/by-partlabel/boot_a': Operation not permitted"
 # (the current slot's boot partition appears to be write-protected :/)