From 233b133e721781939d5b6d8e117ca6732be5e1d4 Mon Sep 17 00:00:00 2001
From: Dylan Van Assche <me@dylanvanassche.be>
Date: Sat, 22 May 2021 09:06:33 +0200
Subject: [PATCH] temp/eg25-manager: sync configs with modem-power (MR 2185)

---
 ...-config-synchronize-with-modem-power.patch | 97 +++++++++++++++++++
 temp/eg25-manager/APKBUILD                    |  2 +
 2 files changed, 99 insertions(+)
 create mode 100644 temp/eg25-manager/0002-config-synchronize-with-modem-power.patch

diff --git a/temp/eg25-manager/0002-config-synchronize-with-modem-power.patch b/temp/eg25-manager/0002-config-synchronize-with-modem-power.patch
new file mode 100644
index 000000000..125c782cb
--- /dev/null
+++ b/temp/eg25-manager/0002-config-synchronize-with-modem-power.patch
@@ -0,0 +1,97 @@
+From a046b539418958eeb2ee26ec5ef273835c98d0d2 Mon Sep 17 00:00:00 2001
+From: Dylan Van Assche <me@dylanvanassche.be>
+Date: Thu, 15 Apr 2021 20:11:03 +0200
+Subject: [PATCH 2/8] config: synchronize with modem-power
+
+We cannot assume default factory values if other drivers change them
+---
+ data/pine64,pinephone-1.0.toml | 13 +++++++++++--
+ data/pine64,pinephone-1.1.toml | 13 +++++++++++--
+ data/pine64,pinephone-1.2.toml | 12 ++++++++++++
+ 3 files changed, 34 insertions(+), 4 deletions(-)
+
+diff --git a/data/pine64,pinephone-1.0.toml b/data/pine64,pinephone-1.0.toml
+index e1f5b24..6e21bda 100644
+--- a/data/pine64,pinephone-1.0.toml
++++ b/data/pine64,pinephone-1.0.toml
+@@ -39,12 +39,21 @@ configure = [
+     { cmd = "QCFG", subcmd = "risignaltype", expect = "\"physical\"" },
+     { cmd = "QCFG", subcmd = "ims", expect = "1" },
+     { cmd = "QCFG", subcmd = "urc/ri/ring", expect = "\"pulse\",2000,1000,5000,\"off\",1" },
+-    { cmd = "QCFG", subcmd = "urc/ri/smsincoming", expect = "\"pulse\",2000" },
+-    { cmd = "QCFG", subcmd = "urc/ri/other", expect = "\"off\",1" },
++    { cmd = "QCFG", subcmd = "urc/ri/smsincoming", expect = "\"pulse\",2000,1" },
++    { cmd = "QCFG", subcmd = "urc/ri/other", expect = "\"off\",1,1" },
+     { cmd = "QCFG", subcmd = "urc/delay", expect = "1" },
+     { cmd = "QURCCFG", subcmd = "urcport", expect = "\"all\"" },
+     { cmd = "QGPS", value = "1" },
+     { cmd = "QSCLK", value = "1" },
++# Reset modem-power configurations to what we expect
++    { cmd = "QCFG", subcmd = "urc/cache", expect = "0" },
++    { cmd = "QCFG", subcmd = "fast/poweroff", expect = "1" },
++    { cmd = "QCFG", subcmd = "apready", expect = "0,0,500" },
++    { cmd = "QCFG", subcmd = "sleepind/level", expect = "0" },
++    { cmd = "QCFG", subcmd = "wakeupin/level", expect = "0,0" },
++    { cmd = "QCFG", subcmd = "ApRstLevel", expect = "0" },
++    { cmd = "QCFG", subcmd = "ModemRstLevel", expect = "0" },
++    { cmd = "QCFG", subcmd = "urc/ri/pin", expect = "uart_ri" },
+ ]
+ suspend = [
+     { cmd = "QGPSEND" },
+diff --git a/data/pine64,pinephone-1.1.toml b/data/pine64,pinephone-1.1.toml
+index e1f5b24..6e21bda 100644
+--- a/data/pine64,pinephone-1.1.toml
++++ b/data/pine64,pinephone-1.1.toml
+@@ -39,12 +39,21 @@ configure = [
+     { cmd = "QCFG", subcmd = "risignaltype", expect = "\"physical\"" },
+     { cmd = "QCFG", subcmd = "ims", expect = "1" },
+     { cmd = "QCFG", subcmd = "urc/ri/ring", expect = "\"pulse\",2000,1000,5000,\"off\",1" },
+-    { cmd = "QCFG", subcmd = "urc/ri/smsincoming", expect = "\"pulse\",2000" },
+-    { cmd = "QCFG", subcmd = "urc/ri/other", expect = "\"off\",1" },
++    { cmd = "QCFG", subcmd = "urc/ri/smsincoming", expect = "\"pulse\",2000,1" },
++    { cmd = "QCFG", subcmd = "urc/ri/other", expect = "\"off\",1,1" },
+     { cmd = "QCFG", subcmd = "urc/delay", expect = "1" },
+     { cmd = "QURCCFG", subcmd = "urcport", expect = "\"all\"" },
+     { cmd = "QGPS", value = "1" },
+     { cmd = "QSCLK", value = "1" },
++# Reset modem-power configurations to what we expect
++    { cmd = "QCFG", subcmd = "urc/cache", expect = "0" },
++    { cmd = "QCFG", subcmd = "fast/poweroff", expect = "1" },
++    { cmd = "QCFG", subcmd = "apready", expect = "0,0,500" },
++    { cmd = "QCFG", subcmd = "sleepind/level", expect = "0" },
++    { cmd = "QCFG", subcmd = "wakeupin/level", expect = "0,0" },
++    { cmd = "QCFG", subcmd = "ApRstLevel", expect = "0" },
++    { cmd = "QCFG", subcmd = "ModemRstLevel", expect = "0" },
++    { cmd = "QCFG", subcmd = "urc/ri/pin", expect = "uart_ri" },
+ ]
+ suspend = [
+     { cmd = "QGPSEND" },
+diff --git a/data/pine64,pinephone-1.2.toml b/data/pine64,pinephone-1.2.toml
+index 4ca1274..598ebaf 100644
+--- a/data/pine64,pinephone-1.2.toml
++++ b/data/pine64,pinephone-1.2.toml
+@@ -36,9 +36,21 @@ configure = [
+     { cmd = "QCFG", subcmd = "risignaltype", expect = "\"physical\"" },
+     { cmd = "QCFG", subcmd = "ims", expect = "1" },
+     { cmd = "QCFG", subcmd = "apready", expect = "1,0,500" },
++    { cmd = "QCFG", subcmd = "urc/ri/ring", expect = "\"pulse\",120,1000,5000,\"off\",1" },
++    { cmd = "QCFG", subcmd = "urc/ri/smsincoming", expect = "\"pulse\",120,1" },
++    { cmd = "QCFG", subcmd = "urc/ri/other", expect = "\"off\",1,1" },
++    { cmd = "QCFG", subcmd = "urc/delay", expect = "0" },
+     { cmd = "QURCCFG", subcmd = "urcport", expect = "\"all\"" },
+     { cmd = "QGPS", value = "1" },
+     { cmd = "QSCLK", value = "1" },
++# Reset modem-power configurations to what we expect
++    { cmd = "QCFG", subcmd = "urc/cache", expect = "0" },
++    { cmd = "QCFG", subcmd = "fast/poweroff", expect = "1" },
++    { cmd = "QCFG", subcmd = "sleepind/level", expect = "0" },
++    { cmd = "QCFG", subcmd = "wakeupin/level", expect = "0,0" },
++    { cmd = "QCFG", subcmd = "ApRstLevel", expect = "0" },
++    { cmd = "QCFG", subcmd = "ModemRstLevel", expect = "0" },
++    { cmd = "QCFG", subcmd = "urc/ri/pin", expect = "uart_ri" },
+ ]
+ suspend = [
+     { cmd = "QGPSEND" },
+-- 
+2.31.1
+
diff --git a/temp/eg25-manager/APKBUILD b/temp/eg25-manager/APKBUILD
index d4d1e6dfc..ffc9b3f35 100644
--- a/temp/eg25-manager/APKBUILD
+++ b/temp/eg25-manager/APKBUILD
@@ -23,6 +23,7 @@ source="
 	eg25-manager.confd
 	eg25-manager.initd
 	0001-mm-iface-clean-out-modem_iface-if-mm-disappears.patch
+	0002-config-synchronize-with-modem-power.patch
 	"
 options="!check"  # no tests
 subpackages="$pkgname-openrc"
@@ -51,4 +52,5 @@ sha512sums="
 55936830afad2968a214fb39cfe1a9db50421dc2ff4f67d04f08f6bd2b094c3ab46799cfc7743bbc5032682d98d1216203adf5264353a05134bea58524ac070b  eg25-manager.confd
 0dd866ce18bac37c3832a463205402f5b34a520e1a57cc37658fb37e21a173fbba2cfab223111c68af768be1d3feeb23e41dbaf6d8dc14a2b2c0c088cf3df041  eg25-manager.initd
 029dce7e7d6e79faab2a63acde2fe76109e5e269bf38d72617d00ffbb89001f75b604e79290d449db7a6f960f9872eb41c2d0ab4a6d82d7563b66e954cd4ffa8  0001-mm-iface-clean-out-modem_iface-if-mm-disappears.patch
+fe6c37c79ea6e89b6bcce78d015a3770347384181595e2c2ff2d42a76baa626cf430125fcefe7679570da268718039f1cce0aef90fe1a5c5ca123425006bbd03  0002-config-synchronize-with-modem-power.patch
 "