From c110eaf7f087709bb07b59f61b13ebd813fbc39a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?=
 <barnabas.czeman@postmarketos.org>
Date: Thu, 13 Feb 2025 00:08:40 +0100
Subject: [PATCH] linux-postmarketos-msm89x7: Upgrade to v6.13-r1 (MR 6207)

[ci:skip-build]: already built successfully in CI
---
 .../linux-postmarketos-qcom-msm89x7/APKBUILD      |  8 ++++----
 .../config-postmarketos-qcom-msm89x7.aarch64      | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/device/testing/linux-postmarketos-qcom-msm89x7/APKBUILD b/device/testing/linux-postmarketos-qcom-msm89x7/APKBUILD
index 2840981f5..4d396f0bc 100644
--- a/device/testing/linux-postmarketos-qcom-msm89x7/APKBUILD
+++ b/device/testing/linux-postmarketos-qcom-msm89x7/APKBUILD
@@ -2,7 +2,7 @@
 _flavor="postmarketos-qcom-msm89x7"
 pkgname=linux-postmarketos-qcom-msm89x7
 pkgver=6.13
-pkgrel=0
+pkgrel=1
 pkgdesc="Mainline kernel fork for Qualcomm QM215/MSM8917/MSM8937/MSM8940 devices"
 arch="aarch64"
 _carch="arm64"
@@ -24,7 +24,7 @@ makedepends="
 	postmarketos-installkernel
 	python3
 	"
-_tag="$pkgver-r0"
+_tag="$pkgver-r1"
 _config="config-$_flavor.$arch"
 source="
 	$pkgname-v$_tag.tar.gz::$url/archive/v$_tag.tar.gz
@@ -57,6 +57,6 @@ package() {
 		"$pkgdir"/usr/share/kernel/$_flavor/kernel.release
 }
 sha512sums="
-25f64b2960a0aacc0a85aabac03229ed229ee4bc5b4f23829ee130ecec0650ff376567655ba7cf7b3c260100e700c24578c0bd8fdfa67986c58850b0ce076b8b  linux-postmarketos-qcom-msm89x7-v6.13-r0.tar.gz
-db22afe48d231cec4f50617f2ce52f8e11bf8f53ab01667f5de5b1220b940e93db38d110d77fd95013a8a76db63a6be499bb83a5732ca0d47bc49b29f30a92b2  config-postmarketos-qcom-msm89x7.aarch64
+38ec04021e99c17a7d173848fe323140b3bea3544b9f69044c9a0ef67718af68826578ddffe5dc2a4fb47c0593675e20167d785f22aa64b60b44c35814dd2bf9  linux-postmarketos-qcom-msm89x7-v6.13-r1.tar.gz
+0b41690bf7c015c221dea92e7fc34a13241319cf47b7ba9408665018a9da4887dade42dbd206e4f59f126b6e16b15164396ebcd7677facf2bb45e9a8ea597ec9  config-postmarketos-qcom-msm89x7.aarch64
 "
diff --git a/device/testing/linux-postmarketos-qcom-msm89x7/config-postmarketos-qcom-msm89x7.aarch64 b/device/testing/linux-postmarketos-qcom-msm89x7/config-postmarketos-qcom-msm89x7.aarch64
index de7c4316f..e161b6d07 100644
--- a/device/testing/linux-postmarketos-qcom-msm89x7/config-postmarketos-qcom-msm89x7.aarch64
+++ b/device/testing/linux-postmarketos-qcom-msm89x7/config-postmarketos-qcom-msm89x7.aarch64
@@ -267,6 +267,7 @@ CONFIG_TRACEPOINTS=y
 #
 # Kexec and crash features
 #
+# CONFIG_KEXEC is not set
 # CONFIG_KEXEC_FILE is not set
 # end of Kexec and crash features
 # end of General setup
@@ -427,6 +428,7 @@ CONFIG_HW_PERF_EVENTS=y
 CONFIG_CC_HAVE_SHADOW_CALL_STACK=y
 # CONFIG_PARAVIRT is not set
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_ARCH_SUPPORTS_KEXEC=y
 CONFIG_ARCH_SUPPORTS_KEXEC_FILE=y
 CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y
 CONFIG_ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG=y
@@ -533,13 +535,20 @@ CONFIG_CMDLINE=""
 #
 # Power management options
 #
-# CONFIG_SUSPEND is not set
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
 # CONFIG_HIBERNATION is not set
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_USERSPACE_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
 CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
 CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_CPU_PM=y
 # CONFIG_ENERGY_MODEL is not set
@@ -1558,6 +1567,7 @@ CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FW_LOADER_COMPRESS=y
 # CONFIG_FW_LOADER_COMPRESS_XZ is not set
 CONFIG_FW_LOADER_COMPRESS_ZSTD=y
+CONFIG_FW_CACHE=y
 # CONFIG_FW_UPLOAD is not set
 # end of Firmware loader
 
@@ -2370,6 +2380,7 @@ CONFIG_TTY=y
 CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
@@ -4844,6 +4855,7 @@ CONFIG_LEDS_IS31FL319X=m
 CONFIG_LEDS_KTD2692=m
 # CONFIG_LEDS_LM3601X is not set
 # CONFIG_LEDS_QCOM_FLASH is not set
+CONFIG_LEDS_QCOM_FLASH_V1=m
 # CONFIG_LEDS_RT4505 is not set
 # CONFIG_LEDS_RT8515 is not set
 CONFIG_LEDS_SGM3140=m
@@ -5342,6 +5354,7 @@ CONFIG_RPMSG_QCOM_SMD=y
 # NXP/Freescale QorIQ SoC drivers
 #
 # CONFIG_QUICC_ENGINE is not set
+# CONFIG_FSL_RCPM is not set
 # end of NXP/Freescale QorIQ SoC drivers
 
 #