From dbff2ff79a107edebe515c0338ae3dc01c3a7a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= <git@apitzsch.eu>
Date: Tue, 13 Dec 2022 21:05:03 +0100
Subject: [PATCH] bq-piccolo: depend on linux-postmarketos-qcom-msm8916 (MR
 3732)

---
 device/testing/device-bq-piccolo/APKBUILD   | 11 +++++------
 device/testing/device-bq-piccolo/deviceinfo | 13 +++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/device/testing/device-bq-piccolo/APKBUILD b/device/testing/device-bq-piccolo/APKBUILD
index 80df207e0..830f82375 100644
--- a/device/testing/device-bq-piccolo/APKBUILD
+++ b/device/testing/device-bq-piccolo/APKBUILD
@@ -1,13 +1,13 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-bq-piccolo
 pkgdesc="BQ Aquaris M5"
-pkgver=2
-pkgrel=2
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8939 soc-qcom-msm8939"
+depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916 soc-qcom-msm8939"
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="
@@ -24,11 +24,10 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="linux-firmware-qcom firmware-qcom-adreno-a420 firmware-bq-piccolo-venus firmware-bq-piccolo-wcnss"
+	depends="firmware-qcom-adreno-a420 firmware-bq-piccolo-venus firmware-bq-piccolo-wcnss"
 	mkdir "$subpkgdir"
 }
 
-
 sha512sums="
-6ecdc0b09e2bf29f682878212a89ddd1085c959b8187452c240b24dcd6e7967f0d5aa06d7515dc7650a5dbf39b10bd3ed95de2ef4570830b91d4f0ab09bca183  deviceinfo
+6e66c90b5a1ae54561705c3c28c282de6adba76cdd8cf5e89bddb56e280b85ceba9125cc20c2e831f891d2b89fc3827798cf4087ee7cf1323240411bd58bb815  deviceinfo
 "
diff --git a/device/testing/device-bq-piccolo/deviceinfo b/device/testing/device-bq-piccolo/deviceinfo
index 154d22bab..d7426ecb0 100644
--- a/device/testing/device-bq-piccolo/deviceinfo
+++ b/device/testing/device-bq-piccolo/deviceinfo
@@ -6,9 +6,9 @@ deviceinfo_name="BQ Aquaris M5"
 deviceinfo_manufacturer="BQ"
 deviceinfo_codename="bq-piccolo"
 deviceinfo_year="2015"
-deviceinfo_dtb="qcom/msm8939-bq-piccolo"
+deviceinfo_dtb="qcom/msm8939-longcheer-l9100"
 deviceinfo_append_dtb="true"
-deviceinfo_modules_initfs="panel-truly-nt35695 msm"
+deviceinfo_modules_initfs="smb1360 panel-longcheer-truly-nt35695 msm atmel_mxt_ts"
 deviceinfo_arch="aarch64"
 
 # Device related
@@ -18,15 +18,16 @@ deviceinfo_keyboard="false"
 deviceinfo_external_storage="true"
 deviceinfo_screen_width="1080"
 deviceinfo_screen_height="1920"
+deviceinfo_getty="ttyMSM0;115200"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
 deviceinfo_kernel_cmdline="earlycon console=ttyMSM0,115200 PMOS_NO_OUTPUT_REDIRECT"
 deviceinfo_generate_bootimg="true"
 deviceinfo_flash_offset_base="0x80000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
+deviceinfo_flash_offset_kernel="0x00080000"
+deviceinfo_flash_offset_ramdisk="0x02000000"
 deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
+deviceinfo_flash_offset_tags="0x01e00000"
 deviceinfo_flash_pagesize="2048"
-
+deviceinfo_flash_sparse="true"