From 10f86941d63dd56b2d67f2cc9b9069dd59adc6cc Mon Sep 17 00:00:00 2001
From: QC8086 <QC8086@QC8086.com>
Date: Mon, 19 Jun 2023 22:56:42 -0400
Subject: [PATCH] device-pine64-pinebookpro: Enable s2idle in elogind. (MR
 4194)

[ci:skip-build]: already built successfully in CI
---
 device/community/device-pine64-pinebookpro/APKBUILD        | 7 ++++++-
 .../device-pine64-pinebookpro.post-install                 | 1 +
 .../community/device-pine64-pinebookpro/enable-s2idle.conf | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 device/community/device-pine64-pinebookpro/enable-s2idle.conf

diff --git a/device/community/device-pine64-pinebookpro/APKBUILD b/device/community/device-pine64-pinebookpro/APKBUILD
index 90920f53f..78a9ffc87 100644
--- a/device/community/device-pine64-pinebookpro/APKBUILD
+++ b/device/community/device-pine64-pinebookpro/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
-pkgver=15
+pkgver=16
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -24,6 +24,7 @@ source="
 	deviceinfo
 	nvme-powersave.initd
 	wlan-powersave-off.start
+	enable-s2idle.conf
 "
 
 build() {
@@ -38,6 +39,9 @@ package() {
 
 	install -D -m755 "$srcdir"/wlan-powersave-off.start \
 		"$pkgdir"/etc/local.d/wlan-powersave-off.start
+
+	install -D -m644 "$srcdir"/enable-s2idle.conf \
+		"$pkgdir"/usr/lib/elogind/sleep.conf.d/enable-s2idle.conf
 }
 
 nonfree_firmware() {
@@ -49,4 +53,5 @@ sha512sums="
 0933548a542098458c0beab4c90ae51a325b284a6c699015ff1179bef607aa9398171e1abc5e851111e0b097ef848577a41ca6b45f2d8349726563f265b8e8f5  deviceinfo
 2abfa31fa56028339efc6d2b6cb838f310990d7110ac4dd996bc4cfcf90f0a8770e70f28f77f7b6929d110e494bc33731302f16b9717729f991c2732be0731d5  nvme-powersave.initd
 0fd7580e197e409978c219726af627cabe347404ee826e32892b61f3da1775b0fd81f8ed5e9a0f0bfaad87faa434d7a73ddaebf475ed0ad8fdcef6690cd692d3  wlan-powersave-off.start
+811af9c79151f41e25916c0f0bb130e82ebfb7d4d5b63413a3fed6700f829c1c017a12e85da230ed2f47a6bd49ed2bf5da19bbc4576ce485a48a2d3808a3a691  enable-s2idle.conf
 "
diff --git a/device/community/device-pine64-pinebookpro/device-pine64-pinebookpro.post-install b/device/community/device-pine64-pinebookpro/device-pine64-pinebookpro.post-install
index 542ae9cb2..2f90cf8a9 100644
--- a/device/community/device-pine64-pinebookpro/device-pine64-pinebookpro.post-install
+++ b/device/community/device-pine64-pinebookpro/device-pine64-pinebookpro.post-install
@@ -2,3 +2,4 @@
 
 rc-update add nvme-powersave boot
 rc-update add sysfsconf default
+loginctl reload
diff --git a/device/community/device-pine64-pinebookpro/enable-s2idle.conf b/device/community/device-pine64-pinebookpro/enable-s2idle.conf
new file mode 100644
index 000000000..dbd5763c1
--- /dev/null
+++ b/device/community/device-pine64-pinebookpro/enable-s2idle.conf
@@ -0,0 +1,3 @@
+[Sleep]
+# Disable deep sleep as it's not currently working likely due to TF-A issues.
+SuspendMode=s2idle