From adf2d837af48bfd6ef8e50017e72c1fdec10644c Mon Sep 17 00:00:00 2001
From: Adel Ahmed <amousa1990@gmail.com>
Date: Thu, 29 Dec 2022 12:07:32 +0200
Subject: [PATCH] sony-leo: add mainline kernel (MR 3770)

[ci:skip-build]: already built successfully in CI
---
 device/testing/device-sony-leo/APKBUILD   | 17 ++++++++++++-----
 device/testing/device-sony-leo/deviceinfo |  6 +++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/device/testing/device-sony-leo/APKBUILD b/device/testing/device-sony-leo/APKBUILD
index a7dcd2114..ea071f04d 100644
--- a/device/testing/device-sony-leo/APKBUILD
+++ b/device/testing/device-sony-leo/APKBUILD
@@ -2,8 +2,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-sony-leo
 pkgdesc="Sony Xperia Z3"
-pkgver=0.2
-pkgrel=1
+pkgver=0.3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -15,6 +15,7 @@ depends="
 "
 makedepends="devicepkg-dev"
 subpackages="
+	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-kernel-downstream:kernel_downstream
 	$pkgname-nonfree-firmware:nonfree_firmware
 	"
@@ -34,12 +35,18 @@ kernel_downstream() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }
 
+kernel_mainline() {
+	pkgdesc="Kernel close to mainline"
+	depends="linux-postmarketos-qcom-msm8974"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 nonfree_firmware() {
-	pkgdesc="Wifi and touchscreen firmware"
-	depends="firmware-sony-leo"
+	pkgdesc="Wifi/GPU firmware"
+	depends="linux-firmware-brcm linux-firmware-cypress firmware-qcom-adreno-a330"
 	mkdir "$subpkgdir"
 }
 
 sha512sums="
-e03ad1d4cb45929b1f3401c5d4b09e2c2c8b5a770f5adeecd7f0403af25e401d3e18dd72585a0069c82ba80c029fe692538c1ffafcfbbf63027d280c6bb87cca  deviceinfo
+46d4d5cb5611fada17e8800dcccaee1573a18dd434ce0332bb647f26a2127c080a52c9e253c828bb559272eea851f980937b6d7088617180b8b06848cb71efa1  deviceinfo
 "
diff --git a/device/testing/device-sony-leo/deviceinfo b/device/testing/device-sony-leo/deviceinfo
index eb96e8672..5965edf19 100644
--- a/device/testing/device-sony-leo/deviceinfo
+++ b/device/testing/device-sony-leo/deviceinfo
@@ -15,9 +15,13 @@ deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
 
+# mainline variables
+deviceinfo_dtb_mainline="qcom-msm8974pro-sony-xperia-shinano-leo"
+deviceinfo_append_dtb_mainline="true"
+
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="androidboot.hardware=qcom msm_rtb.filter=0x37 ehci-hcd.park=3 dwc3.maximum_speed=high dwc3_msm.prop_chg_detect=Y vmalloc=300M buildvariant=userdebug"
+deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"