From dff419cf102e92902c0b9f575a4175d74d54ab3e Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Thu, 25 Jun 2020 14:29:04 +0200 Subject: [PATCH] pine64-pinephone: setup modem to wake device (MR 1163) --- .../device-pine64-pinephone/APKBUILD | 22 +++++++++---------- .../device-pine64-pinephone.post-install | 2 +- ...up-modem-audio.initd => setup-modem.initd} | 2 +- .../{setup-modem-audio.sh => setup-modem.sh} | 21 ++++++++++++++---- 4 files changed, 30 insertions(+), 17 deletions(-) rename device/community/device-pine64-pinephone/{setup-modem-audio.initd => setup-modem.initd} (64%) rename device/community/device-pine64-pinephone/{setup-modem-audio.sh => setup-modem.sh} (65%) diff --git a/device/community/device-pine64-pinephone/APKBUILD b/device/community/device-pine64-pinephone/APKBUILD index 863bdedd5..08c8baf96 100644 --- a/device/community/device-pine64-pinephone/APKBUILD +++ b/device/community/device-pine64-pinephone/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: Luca Weiss # Maintainer: Bart Ribbers pkgname=device-pine64-pinephone -pkgver=0.3 -pkgrel=4 +pkgver=0.5 +pkgrel=0 pkgdesc="PINE64 PinePhone" url="https://postmarketos.org" license="MIT" @@ -25,9 +25,9 @@ source="deviceinfo ucm/HiFi.conf ucm/VoiceCall.conf eg25.initd - setup-modem-audio.sh - setup-modem-audio.initd -" + setup-modem.sh + setup-modem.initd + " build() { devicepkg_build $startdir $pkgname @@ -64,10 +64,10 @@ package() { # Modem install -Dm755 "$srcdir"/eg25.initd "$pkgdir"/etc/init.d/eg25 - install -Dm755 "$srcdir"/setup-modem-audio.sh \ - "$pkgdir"/usr/bin/pinephone_setup-modem-audio - install -Dm755 "$srcdir"/setup-modem-audio.initd \ - "$pkgdir"/etc/init.d/pinephone_setup-modem-audio + install -Dm755 "$srcdir"/setup-modem.sh \ + "$pkgdir"/usr/bin/pinephone_setup-modem + install -Dm755 "$srcdir"/setup-modem.initd \ + "$pkgdir"/etc/init.d/pinephone_setup-modem } nonfree_firmware() { @@ -92,5 +92,5 @@ e852b48a687f9b2a0eca444aa3d00a1818aead9f5e5d28e070b51c9d6f8ec648e66f1d88e2bfa94d 03e2ed3a4212c0ed336586de38b4882c1bb640e04d34dc63ec218c80ff7046c19aaf82c8cdb48db4d3d42f6124addc16b689fd686a90a0f3174c586d1f50e6f2 HiFi.conf d44307c4cbd1fcd4846d30bc1e72800ebd4cbc43fe75e896a501dff06f1b3df21385a009ba5f81ed3f19a5e039bd082da3a88efdf3c034089c8fff3bc16e0a7a VoiceCall.conf 5a1a9c774253e8211cc54f4b3961c4bdc35427726d037b0ecad099915e856590e8267a4a47943ab753772d57261eef89924b407b305b1099a9c4ecd7b5f00b35 eg25.initd -dc110f617efe28df3001630836c7df0cab20e74e99c4bb9d2c2f86367ae024dd30060e8c051c7be0e66e86f4656bef345189a6c13276808c4301d1a6deb8be7d setup-modem-audio.sh -dadfb8ceb7a82fd4a684a0fd4459bfdf0330fccc1d1781dd8549ee9ab5d571b97ee1e5b8dde66ec85e08db410e2d66e63f9da3d0c327ee80bd8303bf81d03eaf setup-modem-audio.initd" +cd94afca9c3f7d48d9bca9a6d8d8917961143e109e9921160cd8b249770191dc5c73f4cdcc7fe1d7b2ff7aa97236c9483213c6108f62da0d37f3716d41840786 setup-modem.sh +c8996a62e4cad92a3b4392912d070ab16515a24937c4c96c25a8b72fbf1632df572df2629c2724d17b6587b3e10ad91e3d5801cee807c0f53324612a47b6cf3c setup-modem.initd" diff --git a/device/community/device-pine64-pinephone/device-pine64-pinephone.post-install b/device/community/device-pine64-pinephone/device-pine64-pinephone.post-install index 473441fbf..e20b09a8e 100644 --- a/device/community/device-pine64-pinephone/device-pine64-pinephone.post-install +++ b/device/community/device-pine64-pinephone/device-pine64-pinephone.post-install @@ -3,4 +3,4 @@ rc-update add eg25 default rc-update add gpsd default rc-update add gpsd_pinephone default -rc-update add pinephone_setup-modem-audio default +rc-update add pinephone_setup-modem default diff --git a/device/community/device-pine64-pinephone/setup-modem-audio.initd b/device/community/device-pine64-pinephone/setup-modem.initd similarity index 64% rename from device/community/device-pine64-pinephone/setup-modem-audio.initd rename to device/community/device-pine64-pinephone/setup-modem.initd index a8903966b..e7b592b75 100644 --- a/device/community/device-pine64-pinephone/setup-modem-audio.initd +++ b/device/community/device-pine64-pinephone/setup-modem.initd @@ -1,6 +1,6 @@ #!/sbin/openrc-run -command="/usr/bin/pinephone_setup-modem-audio" +command="/usr/bin/pinephone_setup-modem" command_background=true depend() { diff --git a/device/community/device-pine64-pinephone/setup-modem-audio.sh b/device/community/device-pine64-pinephone/setup-modem.sh similarity index 65% rename from device/community/device-pine64-pinephone/setup-modem-audio.sh rename to device/community/device-pine64-pinephone/setup-modem.sh index 3cc363229..4046b402e 100644 --- a/device/community/device-pine64-pinephone/setup-modem-audio.sh +++ b/device/community/device-pine64-pinephone/setup-modem.sh @@ -12,21 +12,24 @@ # 1 - map to first slot (the only slot) # QDAI_CONFIG="1,0,0,2,0,1,1,1" +QCFG_CONFIG="physical" DEV=/dev/EG25.AT # Read current config -RET=$(echo "AT+QDAI?" | atinout - $DEV -) +QDAI_ACTUAL_CONFIG=$(echo "AT+QDAI?" | atinout - $DEV -) +QCFG_ACTUAL_CONFIG=$(echo 'AT+QCFG="risignaltype"' | atinout - $DEV -) -if echo $RET | grep -q $QDAI_CONFIG +if echo $QDAI_ACTUAL_CONFIG | grep -q $QDAI_CONFIG && echo $QCFG_ACTUAL_CONFIG | grep -q $QCFG_CONFIG then - echo "Modem audio already configured" + echo "Modem already configured" exit 0 fi - # Modem not configured, we need to send it the digital interface configuration, # then reboot it + +# Configure audio RET=$(echo "AT+QDAI=$QDAI_CONFIG" | atinout - $DEV -) if echo $RET | grep -q OK @@ -37,6 +40,16 @@ else exit 1 fi +# Configure ring device +RET=$(echo 'AT+QCFG="risignaltype","$QCFG_CONFIG"' | atinout - $DEV -) + +if echo $RET | grep -q OK +then + echo "Successfully configured modem ring wakeup" +else + echo "Failed to set modem ring wakeup: $RET" +fi + # Reset module # 1 Set the mode to full functionality (vs 4: no RF, and 1: min functionality) # 1 Reset the modem before changing mode (only available with 1 above)