forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

pine64-pinephone: enable VoLTE (MR 1434)

Browse source 
Also fix configuring device sleep wakeup when modem receives a call
This commit is contained in:
Bart Ribbers 2020-07-21 20:04:51 +02:00
parent ef433965c5
commit 15acd86d60
5 changed files with 92 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
device/community/device-pine64-pinephone/90-modem-eg25.rules
View file

@ -3,3 +3,5 @@ SUBSYSTEMS=="usb", ENV{.LOCAL_ifNum}="$attr{bInterfaceNumber}"
SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="01", SYMLINK+="EG25.NMEA", MODE="0660" SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="01", SYMLINK+="EG25.NMEA", MODE="0660"
SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="02", SYMLINK+="EG25.AT", MODE="0660" SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="02", SYMLINK+="EG25.AT", MODE="0660"
SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="03", SYMLINK+="EG25.MODEM", MODE="0660" SUBSYSTEMS=="usb", KERNEL=="ttyUSB[0-9]*", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="03", SYMLINK+="EG25.MODEM", MODE="0660"
ACTION=="add", SUBSYSTEM=="tty", ATTRS{idVendor}=="2c7c", ATTRS{idProduct}=="0125", ENV{.LOCAL_ifNum}=="02", RUN+="/usr/bin/pinephone_setup-modem '%E{DEVNAME}'"

30
device/community/device-pine64-pinephone/APKBUILD
View file

@ -4,7 +4,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org> # Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=device-pine64-pinephone pkgname=device-pine64-pinephone
pkgver=0.5 pkgver=0.5
pkgrel=4 pkgrel=5
pkgdesc="PINE64 PinePhone" pkgdesc="PINE64 PinePhone"
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
@ -27,7 +27,6 @@ source="deviceinfo
ucm/VoiceCall.conf ucm/VoiceCall.conf
eg25.initd eg25.initd
setup-modem.sh setup-modem.sh
setup-modem.initd
" "
build() { build() {
@ -37,45 +36,43 @@ build() {
package() { package() {
devicepkg_package $startdir $pkgname devicepkg_package $startdir $pkgname
install -D -m644 "$srcdir"/boot.scr \ install -Dm644 "$srcdir"/boot.scr \
"$pkgdir"/boot/boot.scr "$pkgdir"/boot/boot.scr
# Make /boot/allwinner/sun50i-a64-pine64-pinephone*.dtb resolve to /boot/sun50i-a64-pine64-pinephone*.dtb # Make /boot/allwinner/sun50i-a64-pine64-pinephone*.dtb resolve to /boot/sun50i-a64-pine64-pinephone*.dtb
# this is because the device tree names in u-boot include the vendor and the one in postmarketOS doesn't # this is because the device tree names in u-boot include the vendor and the one in postmarketOS doesn't
ln -s .. "$pkgdir"/boot/allwinner ln -s .. "$pkgdir"/boot/allwinner
install -D -m644 "$srcdir"/hwtest.ini \ install -Dm644 "$srcdir"/hwtest.ini \
"$pkgdir"/usr/share/hwtest.ini "$pkgdir"/usr/share/hwtest.ini
# GPS # GPS
install -D -m755 "$srcdir"/gpsd_pinephone.initd \ install -Dm755 "$srcdir"/gpsd_pinephone.initd \
"$pkgdir"/etc/init.d/gpsd_pinephone "$pkgdir"/etc/init.d/gpsd_pinephone
install -D -m755 "$srcdir"/gpsd_device-hook.sh \ install -Dm755 "$srcdir"/gpsd_device-hook.sh \
"$pkgdir"/etc/gpsd/device-hook "$pkgdir"/etc/gpsd/device-hook
install -D -m644 "$srcdir"/90-modem-eg25.rules \
"$pkgdir"/usr/lib/udev/rules.d/90-modem-eg25.rules
install -D -m644 "$srcdir"/10-pinephone-proximity.rules \ install -D -m644 "$srcdir"/10-pinephone-proximity.rules \
"$pkgdir"/usr/lib/udev/rules.d/10-pinephone-proximity.rules "$pkgdir"/usr/lib/udev/rules.d/10-pinephone-proximity.rules
# Fix "sysrq: HELP..." messages in dmesg while playing audio # Fix "sysrq: HELP..." messages in dmesg while playing audio
# (Headphone output interferes with the serial console on the headphone jack) # (Headphone output interferes with the serial console on the headphone jack)
install -D -m644 "$srcdir"/sysrq.conf \ install -Dm644 "$srcdir"/sysrq.conf \
"$pkgdir"/etc/sysctl.d/sysrq.conf "$pkgdir"/etc/sysctl.d/sysrq.conf
# Alsa usecase manager config # Alsa usecase manager config
install -D -m644 "$srcdir"/sun50i-a64-audio.conf \ install -Dm644 "$srcdir"/sun50i-a64-audio.conf \
"$pkgdir"/usr/share/alsa/ucm2/sun50i-a64-audi/sun50i-a64-audio.conf "$pkgdir"/usr/share/alsa/ucm2/sun50i-a64-audi/sun50i-a64-audio.conf
install -D -m644 "$srcdir"/HiFi.conf \ install -Dm644 "$srcdir"/HiFi.conf \
"$pkgdir"/usr/share/alsa/ucm2/sun50i-a64-audi/HiFi.conf "$pkgdir"/usr/share/alsa/ucm2/sun50i-a64-audi/HiFi.conf
install -D -m644 "$srcdir"/VoiceCall.conf \ install -Dm644 "$srcdir"/VoiceCall.conf \
"$pkgdir"/usr/share/alsa/ucm2/sun50i-a64-audi/VoiceCall.conf "$pkgdir"/usr/share/alsa/ucm2/sun50i-a64-audi/VoiceCall.conf
# Modem # Modem
install -Dm755 "$srcdir"/eg25.initd "$pkgdir"/etc/init.d/eg25 install -Dm755 "$srcdir"/eg25.initd "$pkgdir"/etc/init.d/eg25
install -Dm755 "$srcdir"/setup-modem.sh \ install -Dm755 "$srcdir"/setup-modem.sh \
"$pkgdir"/usr/bin/pinephone_setup-modem "$pkgdir"/usr/bin/pinephone_setup-modem
install -Dm755 "$srcdir"/setup-modem.initd \ install -Dm644 "$srcdir"/90-modem-eg25.rules -t "$pkgdir"/usr/lib/udev/rules.d/
"$pkgdir"/etc/init.d/pinephone_setup-modem
} }
nonfree_firmware() { nonfree_firmware() {
@ -96,10 +93,9 @@ f4b5509fd6a8b23f3667f5e7262b3a19c607a37cb9eaf7d0e93eb826d45c26ec12df4810879bacb8
b53cc6f2531854cc9c1e4c334185a20551d64c8675ee8a8eaa03b99d80808fad421a0f6e99e5be212a974d88c85f461a71ba59ac59c29f298c82f211e3be1ef4 10-pinephone-proximity.rules b53cc6f2531854cc9c1e4c334185a20551d64c8675ee8a8eaa03b99d80808fad421a0f6e99e5be212a974d88c85f461a71ba59ac59c29f298c82f211e3be1ef4 10-pinephone-proximity.rules
1017fc3f325227da58c77abdc59e9735288d91a7ccc63ec784fe0241c523786b617a11ce8045dab2a74ca12a7dd70aaa334af91836418db1e96a3266fecaa4fd gpsd_pinephone.initd 1017fc3f325227da58c77abdc59e9735288d91a7ccc63ec784fe0241c523786b617a11ce8045dab2a74ca12a7dd70aaa334af91836418db1e96a3266fecaa4fd gpsd_pinephone.initd
ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd46444dd3c0a637ec08ce6125b18240fe6bfc13f624a15192e648 gpsd_device-hook.sh ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd46444dd3c0a637ec08ce6125b18240fe6bfc13f624a15192e648 gpsd_device-hook.sh
aa0b7191548e89ddfc6cf5b1f637c7ee7ab4c2025cbfc6328e7e482e5b179ea072779ca332a18094e3d424708b923c2334210591fc369831426992f540c07abc 90-modem-eg25.rules 7dc2b7c20b4a2b15f597a6417bd01797643dad84a3683b0dee648e030fb6326e9d020307643fdcdf1bb43fc44af9975697e417003bd359610bae2d8ce614fc00 90-modem-eg25.rules
e852b48a687f9b2a0eca444aa3d00a1818aead9f5e5d28e070b51c9d6f8ec648e66f1d88e2bfa94d74533f9ffb9aacc1703da2a06693f85fa04ff97fd7528012 sun50i-a64-audio.conf e852b48a687f9b2a0eca444aa3d00a1818aead9f5e5d28e070b51c9d6f8ec648e66f1d88e2bfa94d74533f9ffb9aacc1703da2a06693f85fa04ff97fd7528012 sun50i-a64-audio.conf
03e2ed3a4212c0ed336586de38b4882c1bb640e04d34dc63ec218c80ff7046c19aaf82c8cdb48db4d3d42f6124addc16b689fd686a90a0f3174c586d1f50e6f2 HiFi.conf 03e2ed3a4212c0ed336586de38b4882c1bb640e04d34dc63ec218c80ff7046c19aaf82c8cdb48db4d3d42f6124addc16b689fd686a90a0f3174c586d1f50e6f2 HiFi.conf
d44307c4cbd1fcd4846d30bc1e72800ebd4cbc43fe75e896a501dff06f1b3df21385a009ba5f81ed3f19a5e039bd082da3a88efdf3c034089c8fff3bc16e0a7a VoiceCall.conf d44307c4cbd1fcd4846d30bc1e72800ebd4cbc43fe75e896a501dff06f1b3df21385a009ba5f81ed3f19a5e039bd082da3a88efdf3c034089c8fff3bc16e0a7a VoiceCall.conf
5a1a9c774253e8211cc54f4b3961c4bdc35427726d037b0ecad099915e856590e8267a4a47943ab753772d57261eef89924b407b305b1099a9c4ecd7b5f00b35 eg25.initd 5a1a9c774253e8211cc54f4b3961c4bdc35427726d037b0ecad099915e856590e8267a4a47943ab753772d57261eef89924b407b305b1099a9c4ecd7b5f00b35 eg25.initd
cd94afca9c3f7d48d9bca9a6d8d8917961143e109e9921160cd8b249770191dc5c73f4cdcc7fe1d7b2ff7aa97236c9483213c6108f62da0d37f3716d41840786 setup-modem.sh 3a1af3979232a31995f5c103e092e075987d6e62509f4de59dbb64d6559d74e73c62161707108e27137faab49ae16612e5ada350c5633428d30df37e1b7b7f10 setup-modem.sh"
6d025c526af93d976472713573c156d2a8365e0350dfc482edf2bfbcfa32f4e74b2debe6b9bb393f5c39bf3638e9ec024f548e53774535dae8a7cce2613040ab setup-modem.initd"

1
device/community/device-pine64-pinephone/device-pine64-pinephone.post-install
View file

@ -3,4 +3,3 @@
rc-update add eg25 default rc-update add eg25 default
rc-update add gpsd default rc-update add gpsd default
rc-update add gpsd_pinephone default rc-update add gpsd_pinephone default
rc-update add pinephone_setup-modem default

10
device/community/device-pine64-pinephone/setup-modem.initd
View file

@ -1,10 +0,0 @@
#!/sbin/openrc-run
command="/usr/bin/pinephone_setup-modem"
pidfile="/var/run/$SVCNAME.pid"
command_background=true
depend() {
after eg25
before ofono
}

95
device/community/device-pine64-pinephone/setup-modem.sh
View file

@ -1,5 +1,9 @@
#!/bin/sh #!/bin/sh
log() {
echo "$@" | logger -t "postmarketOS:modem-setup"
}
# Current modem routing # Current modem routing
# #
# 1 - Digital PCM # 1 - Digital PCM
@ -12,17 +16,58 @@
# 1 - map to first slot (the only slot) # 1 - map to first slot (the only slot)
# #
QDAI_CONFIG="1,0,0,2,0,1,1,1" QDAI_CONFIG="1,0,0,2,0,1,1,1"
QCFG_CONFIG="physical" QCFG_RISIGNALTYPE_CONFIG="physical"
QMBNCFG_CONFIG="1"
QCFG_IMS_CONFIG="1"
DEV=/dev/EG25.AT if [ -z "$1" ]
then
DEV="/dev/EG25.AT"
else
DEV="$1"
fi
# When running this script from udev the modem might not be fully initialized
# yet, so give it some time to initialize
#
# We'll try to query for the firmware version for 15 seconds after which we'll
# consider the initialization failed
log "Waiting for the modem to initialize"
INITIALIZED=false
for second in $(seq 1 15)
do
if echo "AT+QDAI?" | atinout - $DEV - | grep -q OK
then
INITIALIZED=true
break
fi
log "Waited for $second seconds..."
sleep 1
done
if $INITIALIZED
then
log "Modem initialized"
else
log "Modem failed to initialize"
exit 1
fi
# Read current config # Read current config
QDAI_ACTUAL_CONFIG=$(echo "AT+QDAI?" | atinout - $DEV -) QDAI_ACTUAL_CONFIG=$(echo "AT+QDAI?" | atinout - $DEV -)
QCFG_ACTUAL_CONFIG=$(echo 'AT+QCFG="risignaltype"' | atinout - $DEV -) QCFG_RISIGNALTYPE_ACTUAL_CONFIG=$(echo 'AT+QCFG="risignaltype"' | atinout - $DEV -)
QMBNCFG_ACTUAL_CONFIG=$(echo 'AT+QMBNCFG="AutoSel"' | atinout - $DEV -)
QCFG_IMS_ACTUAL_CONFIG=$(echo 'AT+QCFG="ims"' | atinout - $DEV -)
if echo $QDAI_ACTUAL_CONFIG | grep -q $QDAI_CONFIG && echo $QCFG_ACTUAL_CONFIG | grep -q $QCFG_CONFIG if echo $QDAI_ACTUAL_CONFIG | grep -q $QDAI_CONFIG && \
echo $QCFG_RISIGNALTYPE_ACTUAL_CONFIG | grep -q $QCFG_RISIGNALTYPE_CONFIG && \
echo $QMBNCFG_ACTUAL_CONFIG | grep -q $QMBNCFG_CONFIG && \
echo $QCFG_IMS_ACTUAL_CONFIG | grep -q $QCFG_IMS_CONFIG
then then
echo "Modem already configured" log "Modem already configured"
exit 0 exit 0
fi fi
@ -32,22 +77,37 @@ fi
# Configure audio # Configure audio
RET=$(echo "AT+QDAI=$QDAI_CONFIG" | atinout - $DEV -) RET=$(echo "AT+QDAI=$QDAI_CONFIG" | atinout - $DEV -)
if echo $RET | grep -q OK if ! echo $RET | grep -q OK
then then
echo "Successfully configured modem audio" log "Failed to configure audio: $RET"
else
echo "Failed to set modem audio up: $RET"
exit 1 exit 1
fi fi
# Configure ring device # Configure ring device
RET=$(echo 'AT+QCFG="risignaltype","$QCFG_CONFIG"' | atinout - $DEV -) RET=$(echo "AT+QCFG=\"risignaltype\",\"$QCFG_RISIGNALTYPE_CONFIG\"" | atinout - $DEV -)
if echo $RET | grep -q OK if ! echo $RET | grep -q OK
then then
echo "Successfully configured modem ring wakeup" log "Failed to configure modem ring wakeup: $RET"
else exit 1
echo "Failed to set modem ring wakeup: $RET" fi
# Configure VoLTE auto selecting profile
RET=$(echo "AT+QMBNCFG=\"AutoSel\",$QMBNCFG_CONFIG" | atinout - $DEV -)
if ! echo $RET | grep -q OK
then
log "Failed to enable VoLTE profile auto selecting: $RET"
exit 1
fi
# Enable VoLTE
RET=$(echo "AT+QCFG=\"ims\",$QCFG_IMS_CONFIG" | atinout - $DEV -)
if ! echo $RET | grep -q OK
then
log "Failed to enable VoLTE: $RET"
exit 1
fi fi
# Reset module # Reset module
@ -56,9 +116,8 @@ fi
# #
RET=$(echo "AT+CFUN=1,1" | atinout - $DEV -) RET=$(echo "AT+CFUN=1,1" | atinout - $DEV -)
if echo $RET | grep -q OK if ! echo $RET | grep -q OK
then then
echo "Successfully reset the modem to apply audio configuration" log "Failed to reset the module: $RET"
else exit 1
echo "Failed to reset the modem to apply audio configuration: $RET"
fi fi