google-sargo: switch to close-to mainline kernel (MR 3488)

Note: This kernel does not have support for flash LED or haptics.

device/testing/device-google-sargo/APKBUILD

@@ -1,14 +1,14 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
-pkgver=0.1
+pkgver=0.2
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	linux-google-sargo
+	linux-postmarketos-qcom-sdm670
 	mesa-dri-gallium
 	mkbootimg
 	postmarketos-base
@@ -26,5 +26,5 @@ package() {
 }
 
 sha512sums="
-ca8b0ae5d6a698a7f2af7f5724cbe6603e5191542720c5bca606482d1114459b9a3709b6165ab8cc62cf6fe29c0cb74dfb782067cd3d9e67d149b38b839736be  deviceinfo
+9b6422a9a03e82e92f3a8a03b52211f5e607c4d5b9ba27adc2a70cb58227aa1a077eaef6c9c6ebc362abb33e70cb709b0d119d9d2774e9719f3494b0cb5b46b1  deviceinfo
 "

device/testing/device-google-sargo/deviceinfo

@@ -6,6 +6,8 @@ deviceinfo_format_version="0"
 deviceinfo_name="Google Pixel 3a"
 deviceinfo_manufacturer="Google"
 deviceinfo_codename="google-sargo"
+deviceinfo_dtb="qcom/sdm670-google-sargo"
+deviceinfo_append_dtb="true"
 deviceinfo_year="2019"
 deviceinfo_arch="aarch64"
 
@@ -15,10 +17,10 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="false"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="2220"
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="console=ttyMSM0,115200n8 androidboot.console=ttyMSM0 printk.devkmsg=on msm_rtb.filter=0x237 ehci-hcd.park=3 service_locator.enable=1 firmware_class.path=/vendor/firmware cgroup.memory=nokmem lpm_levels.sleep_disabled=1 loop.max_part=7 androidboot.boot_devices=soc/7c4000.sdhci androidboot.super_partition=system buildvariant=userdebug"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_mtk_mkimage="false"
@@ -31,6 +33,8 @@ deviceinfo_flash_offset_second="0x00000000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_sparse="true"
 
-deviceinfo_super_partitions="/dev/mmcblk0p68 /dev/mmcblk0p69"
+# Google Inc. Nexus/Pixel Device (tether)
+deviceinfo_usb_idVendor="0x18d1"
+deviceinfo_usb_idProduct="0x4ee3"
 
-deviceinfo_no_framebuffer="true"
+deviceinfo_super_partitions="/dev/mmcblk0p68 /dev/mmcblk0p69"

device/testing/linux-postmarketos-qcom-sdm670/APKBUILD

@@ -0,0 +1,60 @@
+# Maintainer: Richard Acayan <mailingradian@gmail.com>
+# Stable Linux kernel with patches for SDM670 devices
+# Kernel config based on: arch/arm64/configs/{defconfig,sdm{670,845}.config}
+
+_flavor="postmarketos-qcom-sdm670"
+pkgname=linux-$_flavor
+pkgver=5.19.14
+pkgrel=0
+pkgdesc="Mainline Kernel fork for SDM670 devices"
+arch="aarch64"
+_carch="arm64"
+url="https://gitlab.com/sdm670-mainline/linux"
+license="GPL-2.0-only"
+options="!strip !check !tracedeps
+	pmb:cross-native"
+makedepends="bash bison findutils flex installkernel openssl-dev perl"
+
+_config="config-$_flavor.$arch"
+_tag="sdm670-v$pkgver"
+
+# Source
+source="
+	https://gitlab.com/sdm670-mainline/linux/-/archive/$_tag/linux-$_tag.tar.gz
+	$_config
+"
+builddir="$srcdir/linux-$_tag"
+
+prepare() {
+	default_prepare
+	cp "$srcdir/config-$_flavor.$arch" .config
+}
+
+build() {
+	unset LDFLAGS
+	make ARCH="$_carch" CC="${CC:-gcc}" \
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor"
+}
+
+package() {
+	mkdir -p "$pkgdir"/boot
+
+	install -Dm644 "$builddir/arch/$_carch/boot/Image.gz" \
+		"$pkgdir/boot/vmlinuz"
+
+	make modules_install dtbs_install \
+		ARCH="$_carch" \
+		INSTALL_PATH="$pkgdir"/boot/ \
+		INSTALL_MOD_PATH="$pkgdir" \
+		INSTALL_MOD_STRIP=1 \
+		INSTALL_DTBS_PATH="$pkgdir"/boot/dtbs
+	rm -f "$pkgdir"/lib/modules/*/build "$pkgdir"/lib/modules/*/source
+
+	install -D "$builddir"/include/config/kernel.release \
+		"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
+}
+
+sha512sums="
+cae2d985d2a6a993365da34d69f2428491f4034c8e2a3c2c00a1cc6392d0efd9b379187a385f1b629e9ef5ceaf5dd77931e72acd275d9e7fb8238ed100ca76fa  linux-sdm670-v5.19.14.tar.gz
+9cf5910076d45a238375a2684557e66e169097be409a6fa9d9b018900a4f81bc5f9b998c8c855facad200a21bdca26ca6db4b4c53d705ac6a2f62b5f3311aa08  config-postmarketos-qcom-sdm670.aarch64
+"