.gitlab-ci/testcases/test_device.py

@@ -57,6 +57,14 @@ def test_aports_device(args):
         if "!archcheck" not in apkbuild["options"]:
             raise RuntimeError("!archcheck missing in options= line: " + path)
 
+        if deviceinfo["flash_kernel_on_update"] == "true" \
+                and "postmarketos-update-kernel" not in apkbuild["depends"]:
+            raise RuntimeError(
+                "Deviceinfo indicates this device supports automatic kernel"
+                " flashing on update, but doesn't depend on"
+                " 'postmarketos-update-kernel'. Please add the missing"
+                " dependency.")
+
 
 def test_aports_device_kernel(args):
     """

CODEOWNERS

 # https://docs.gitlab.com/ee/user/project/code_owners.html
 
-device/*/*-pine64-pinephone/        @craftyguy @milesalan @bshah
+device/*/*-pine64-pinephone/        @craftyguy @milesalan @bshah @proycon @anjandev @StacyHarper
 device/*/*-purism-librem5/          @craftyguy @bshah
 main/osk-sdl/                       @craftyguy
 main/mesa-pvr-dri-classic/          @xc-racer99

channels.cfg

@@ -8,17 +8,13 @@ branch_pmaports=master
 branch_aports=master
 mirrordir_alpine=edge
 
-# NOTE: "stable", "stable-next" are actually "v20.05" and "v21.03". They will
-# get changed in this file in the near future, keeping the old names for a bit
-# to give everybody time to upgrade to pmbootstrap 1.30.0. More information:
-# https://gitlab.com/postmarketOS/pmbootstrap/-/issues/2015
-[stable-next]
+[v21.03]
 description=Latest release / Recommended for best stability
 branch_pmaports=v21.03
 branch_aports=3.13-stable
 mirrordir_alpine=v3.13
 
-[stable]
+[v20.05]
 description=Old release (unsupported)
 branch_pmaports=v20.05
 branch_aports=3.12-stable

device/community/device-oneplus-enchilada/APKBUILD

@@ -3,13 +3,20 @@
 
 pkgname=device-oneplus-enchilada
 pkgdesc="OnePlus 6"
-pkgver=1
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg linux-postmarketos-qcom-sdm845 soc-qcom-sdm845"
+depends="
+	linux-postmarketos-qcom-sdm845
+	mkbootimg
+	postmarketos-base
+	postmarketos-update-kernel
+	soc-qcom-sdm845
+	soc-qcom-sdm845-ucm
+"
 makedepends="devicepkg-dev"
 source="deviceinfo rootston.ini"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
@@ -23,8 +30,8 @@ package() {
 }
 
 nonfree_firmware() {
-	pkgdesc="Modem, WiFi and GPU Firmware"
-	depends="firmware-oneplus-sdm845"
+	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
+	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs"
 	mkdir "$subpkgdir"
 }
 
@@ -34,5 +41,7 @@ phosh() {
 		"$subpkgdir"/etc/phosh/rootston.ini
 }
 
-sha512sums="cfcc13db27379de13ccf3695d3feb47ba934995604b2bd4741d58dc30f96254d1483dd2031d3d6675387b0444d30300397ccd50fbdceea537834bf0ad690b530  deviceinfo
-035f97e328ff9f976b082e66b97f76036cdee9825f3022471c7c5d371291cc4b5bd5c18196cd49f4cd9ad6390abe691b506de3b221e3c122433d5620e3b3c4c9  rootston.ini"
+sha512sums="
+f1ed55145084a9d9e8c6110079188fd68b5cf8982f904db928eaabe72f538ac0e026d374a19d3588b9b6d4350bb0a238510e0160cb5ebbcc6e6901ba6811e59b  deviceinfo
+035f97e328ff9f976b082e66b97f76036cdee9825f3022471c7c5d371291cc4b5bd5c18196cd49f4cd9ad6390abe691b506de3b221e3c122433d5620e3b3c4c9  rootston.ini
+"

device/community/device-oneplus-enchilada/deviceinfo

@@ -17,7 +17,7 @@ deviceinfo_screen_height="2280"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="quiet"
+deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
@@ -32,10 +32,11 @@ deviceinfo_flash_sparse="true"
 # Kernel options
 deviceinfo_dtb="qcom/sdm845-oneplus-enchilada"
 deviceinfo_append_dtb="true"
+deviceinfo_flash_kernel_on_update="true"
 
 # Required for devices using UFS as storage (instead of e.g. eMMC)
 deviceinfo_rootfs_image_sector_size="4096"
 
 # osk-sdl
-deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c"
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c pmi8998_fg pmi8998_haptics"
 deviceinfo_mesa_driver="msm"

device/community/device-oneplus-fajita/APKBUILD

@@ -3,13 +3,20 @@
 
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
-pkgver=1
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg linux-postmarketos-qcom-sdm845 soc-qcom-sdm845"
+depends="
+	linux-postmarketos-qcom-sdm845
+	mkbootimg
+	postmarketos-base
+	postmarketos-update-kernel
+	soc-qcom-sdm845
+	soc-qcom-sdm845-ucm
+"
 makedepends="devicepkg-dev"
 source="deviceinfo rootston.ini"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-phosh"
@@ -23,8 +30,8 @@ package() {
 }
 
 nonfree_firmware() {
-	pkgdesc="Modem, WiFi and GPU Firmware"
-	depends="firmware-oneplus-sdm845"
+	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
+	depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs"
 	mkdir "$subpkgdir"
 }
 
@@ -34,5 +41,7 @@ phosh() {
 		"$subpkgdir"/etc/phosh/rootston.ini
 }
 
-sha512sums="034def213ac5720be477251f9ba1ece31b733716f8372cdb58e36d405f0a4d651abb5943fd9d5fb55c20c8dcaac4398372ddace863a4cae589bb62e3599af453  deviceinfo
-035f97e328ff9f976b082e66b97f76036cdee9825f3022471c7c5d371291cc4b5bd5c18196cd49f4cd9ad6390abe691b506de3b221e3c122433d5620e3b3c4c9  rootston.ini"
+sha512sums="
+54e32ecf256b398b4e077b214b6ca8b838bc0193f9703ce45368257b03c1f3ffb319afdb6f30954f59fe263908298c97e2c185562dcb05b5fb35b3e10e1de52f  deviceinfo
+035f97e328ff9f976b082e66b97f76036cdee9825f3022471c7c5d371291cc4b5bd5c18196cd49f4cd9ad6390abe691b506de3b221e3c122433d5620e3b3c4c9  rootston.ini
+"

device/community/device-oneplus-fajita/deviceinfo

@@ -17,7 +17,7 @@ deviceinfo_screen_height="2340"
 
 # Bootloader related
 deviceinfo_flash_method="fastboot"
-deviceinfo_kernel_cmdline="quiet"
+deviceinfo_kernel_cmdline="PMOS_NO_OUTPUT_REDIRECT console=ttyMSM0,115200"
 deviceinfo_generate_bootimg="true"
 deviceinfo_bootimg_qcdt="false"
 deviceinfo_bootimg_dtb_second="false"
@@ -32,10 +32,11 @@ deviceinfo_flash_sparse="true"
 # Kernel options
 deviceinfo_dtb="qcom/sdm845-oneplus-fajita"
 deviceinfo_append_dtb="true"
+deviceinfo_flash_kernel_on_update="true"
 
 # Required for devices using UFS as storage (instead of e.g. eMMC)
 deviceinfo_rootfs_image_sector_size="4096"
 
 # osk-sdl
-deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c pmi8998_fg"
+deviceinfo_modules_initfs="i2c_qcom_geni rmi_core rmi_i2c pmi8998_fg pmi8998_haptics"
 deviceinfo_mesa_driver="msm"

device/community/device-pine64-pinetab/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Martijn Braam <martijn@brixit.nl>
 pkgname=device-pine64-pinetab
 pkgdesc="PINE64 PineTab"
-pkgver=0.9
-pkgrel=0
+pkgver=0.10
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,7 +14,7 @@ depends="
 	mesa-egl
 	mesa-dri-gallium
 	postmarketos-base
-	u-boot-pinephone
+	u-boot-pinephone>=2021.01_git20201228-r2
 	u-boot-tools
 "
 makedepends="devicepkg-dev"
@@ -26,6 +26,7 @@ subpackages="
 	$pkgname-phosh
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-plasma-mobile:plasma_mobile
+	$pkgname-upower
 	"
 install="$pkgname.post-install"
 source="
@@ -39,7 +40,9 @@ source="
 	uboot-script.cmd
 	ucm/HiFi.conf
 	ucm/PineTab.conf
+	pulse-pinetab.conf
 	weston.ini
+	UPower.conf
 	"
 
 prepare() {
@@ -128,6 +131,10 @@ package() {
 	install -D -m644 "$srcdir"/HiFi.conf \
 		"$pkgdir"/usr/share/alsa/ucm2/PineTab/HiFi.conf
 
+	# Pulseaudio config
+	install -Dm644 "$srcdir"/pulse-pinetab.conf \
+		"$pkgdir"/etc/pulse/daemon.conf.d/89-pinetab.conf
+
 	# Fix for the meta key on v1 keyboard dock, probably not needed on newer revisions
 	install -Dm644 "$srcdir"/99-pinetab-keyboard.hwdb \
 		"$pkgdir"/etc/udev/hwdb.d/99-pinetab-keyboard.hwdb
@@ -148,6 +155,15 @@ plasma_mobile() {
 	install -Dm644 "$srcdir"/kirigami-lowpower.sh "$subpkgdir"/etc/profile.d/kirigami-lowpower.sh
 }
 
+upower() {
+	install_if="$pkgname=$pkgver-r$pkgrel upower"
+	replaces="upower"
+
+	# Shutdown when PMIC reports critical battery level
+	install -Dm644 "$srcdir"/UPower.conf \
+		"$subpkgdir"/etc/UPower/UPower.conf
+}
+
 sha512sums="
 8d1ef04911f1cfa7eda8185f4f4d807af23105a7c8f23d8c18f02afeccd8ab124de70c2e2760c154a3128fe3793447039fb0abf37aa496f597d27051e275033e  99-pinetab-keyboard.hwdb
 a884cdb677d40f733fde5ce57fc2740a29a9f8a4a62d9ac327710a650d0d21d378226653e50d67cd0765f6e6cb81e6a243a92905d0ce8b8d8ab751abb69a79d5  deviceinfo
@@ -159,5 +175,7 @@ f4b5509fd6a8b23f3667f5e7262b3a19c607a37cb9eaf7d0e93eb826d45c26ec12df4810879bacb8
 0e3f69170072f150f449cd9ccd9897728558a98acf2d5b85484ae8104b97f84e77760d7a30eeeccaf37d12cf870b3107ee34cefe55bdb033f3c7ac87d2093d24  uboot-script.cmd
 a2fd8037c9a1af000f31c7005436d791525317f818c553d1e2f472b4df76c71d769ecbf67b369a478bea720a6215eaa9fb6a26ba218ac9410513e2345ebe7b4c  HiFi.conf
 3bdf9d4c41058680d488d9b4a2ac5fd693ceddc5f319a577480546f8af7d9d64c9d3196e73cb0c00e793697eef4ad075c88c3d274702a5387c15945bc749d844  PineTab.conf
+9c472065b19141dd4c7555869b955de2e679b36e597f9fa3bdac18d0e9460986b0e2fffe1e04751301305f1b6474c1375803afb7d6212eeae91b4905d0bf8ff8  pulse-pinetab.conf
 6374ef977eab14b71fa88057ebd52ca03035e387e5f41504598a990f24b2e92bccd2db476c545dc541000e08fccdecb6f1cd63e25b5835df706269e0384dacc7  weston.ini
+ed0e03f7e1c0348c06be9a7922414469245604ce813bbf0c8910ef211cb993bbb0d0d4615c9c961d50712415f85d6b73e0cf02780ac784666aac56e4889341e4  UPower.conf
 "

device/community/device-pine64-pinetab/UPower.conf

+# Only the system vendor should modify this file, ordinary users
+# should not have to change anything.
+
+[UPower]
+
+# Enable the Watts Up Pro device.
+#
+# The Watts Up Pro contains a generic FTDI USB device without a specific
+# vendor and product ID. When we probe for WUP devices, we can cause
+# the user to get a perplexing "Device or resource busy" error when
+# attempting to use their non-WUP device.
+#
+# The generic FTDI device is known to also be used on:
+#
+# - Sparkfun FT232 breakout board
+# - Parallax Propeller
+#
+# default=false
+EnableWattsUpPro=false
+
+# Don't poll the kernel for battery level changes.
+#
+# Some hardware will send us battery level changes through
+# events, rather than us having to poll for it. This option
+# allows disabling polling for hardware that sends out events.
+#
+# default=false
+NoPollBatteries=false
+
+# Do we ignore the lid state
+#
+# Some laptops are broken. The lid state is either inverted, or stuck
+# on or off. We can't do much to fix these problems, but this is a way
+# for users to make the laptop panel vanish, a state that might be used
+# by a couple of user-space daemons. On Linux systems, see also
+# logind.conf(5).
+#
+# default=false
+IgnoreLid=false
+
+# Policy for warnings and action based on battery levels
+#
+# Whether battery percentage based policy should be used. The default
+# is to use the time left, change to true to use the percentage, which
+# should work around broken firmwares. It is also more reliable than
+# the time left (frantically saving all your files is going to use more
+# battery than letting it rest for example).
+# default=true
+UsePercentageForPolicy=true
+
+# When UsePercentageForPolicy is true, the levels at which UPower will
+# consider the battery low, critical, or take action for the critical
+# battery level.
+#
+# This will also be used for batteries which don't have time information
+# such as that of peripherals.
+#
+# If any value is invalid, or not in descending order, the defaults
+# will be used.
+#
+# Defaults:
+# PercentageLow=10
+# PercentageCritical=3
+# PercentageAction=2
+PercentageLow=20
+PercentageCritical=17
+PercentageAction=15
+
+# When UsePercentageForPolicy is false, the time remaining at which UPower
+# will consider the battery low, critical, or take action for the critical
+# battery level.
+#
+# If any value is invalid, or not in descending order, the defaults
+# will be used.
+#
+# Defaults:
+# TimeLow=1200
+# TimeCritical=300
+# TimeAction=120
+TimeLow=1200
+TimeCritical=300
+TimeAction=120
+
+# The action to take when "TimeAction" or "PercentageAction" above has been
+# reached for the batteries (UPS or laptop batteries) supplying the computer
+#
+# Possible values are:
+# PowerOff
+# Hibernate
+# HybridSleep
+#
+# If HybridSleep isn't available, Hibernate will be used
+# If Hibernate isn't available, PowerOff will be used
+CriticalPowerAction=PowerOff

device/community/device-pine64-pinetab/pulse-pinetab.conf

+default-sample-rate=48000
+alternate-sample-rate=8000

device/community/soc-qcom-sdm845/APKBUILD

 # Maintainer: Caleb Connolly (kalube) <caleb@connolly.tech>
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
-pkgver=3
+pkgver=4
 pkgrel=1
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -13,7 +13,7 @@ subpackages="
 	$pkgname-ucm
 "
 
-_ucm_commit="9e0051807472822bc4090a2d03ab5dacd7787ab8"
+_ucm_commit="f959b6c46165f23eebcf34ffefef14c6be015a55"
 source="
 	alsa-ucm-conf-$_ucm_commit.tar.gz::https://gitlab.com/sdm845-mainline/alsa-ucm-conf/-/archive/$_ucm_commit/alsa-ucm-conf-$_ucm_commit.tar.gz
 	90-feedbackd-pmi8998.rules
@@ -40,5 +40,7 @@ ucm() {
 	cp -r "$srcdir/alsa-ucm-conf-$_ucm_commit"/ucm2 "$subpkgdir"/usr/share/alsa/
 }
 
-sha512sums="3af38c56d2b591c855516be5bf30f71623cb20053191d4324f9896c7d5f17661e93d95e6c682bcd56d0dd4c53374b349c0460c21b6652b737a2d98abe3b954d0  alsa-ucm-conf-9e0051807472822bc4090a2d03ab5dacd7787ab8.tar.gz
-ea3c7f9664eb9be2ffb6879db044b44cd826747b73c6527d54d79102e58a44e1b32d08d0b1b261329eae43d6a30bc8ef80d89b1d63af1c74ba5dc66ac57911d7  90-feedbackd-pmi8998.rules"
+sha512sums="
+48fba9c041a2a2dfef9f038dfeeb7f636ed4e3b4d1babe2bd9b6ee350a4a34472b0f20d69b57864aa79fb28b24bb38a88ef1542a6d3211db713b361a4d136745  alsa-ucm-conf-f959b6c46165f23eebcf34ffefef14c6be015a55.tar.gz
+ea3c7f9664eb9be2ffb6879db044b44cd826747b73c6527d54d79102e58a44e1b32d08d0b1b261329eae43d6a30bc8ef80d89b1d63af1c74ba5dc66ac57911d7  90-feedbackd-pmi8998.rules
+"

device/main/device-pine64-pinephone/APKBUILD

@@ -4,8 +4,8 @@
 # Co-Maintainer: Bart Ribbers <bribbers@disroot.org>
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=device-pine64-pinephone
-pkgver=0.27
-pkgrel=0
+pkgver=0.28
+pkgrel=2
 pkgdesc="PINE64 PinePhone"
 url="https://postmarketos.org"
 license="MIT"
@@ -16,6 +16,7 @@ subpackages="
 	$pkgname-phosh
 	$pkgname-shelli
 	$pkgname-plasma-mobile:plasma_mobile
+	$pkgname-upower
 	"
 depends="
 	alsa-ucm-conf
@@ -28,7 +29,7 @@ depends="
 	mesa-dri-gallium
 	mesa-egl
 	postmarketos-base
-	u-boot-pinephone
+	u-boot-pinephone>=2021.01_git20201228-r2
 	u-boot-tools
 	"
 makedepends="devicepkg-dev"
@@ -55,6 +56,8 @@ source="
 	ucm/HiFi.conf
 	ucm/PinePhone.conf
 	ucm/VoiceCall.conf
+	UPower.conf
+	pulse-pinephone.conf
 	"
 # workaround to purge the -elogind subpackage that was previously
 # created/installed
@@ -109,6 +112,10 @@ package() {
 	install -Dm644 "$srcdir"/VoiceCall.conf \
 		"$pkgdir"/usr/share/alsa/ucm2/PinePhone/VoiceCall.conf
 
+	# Pulseaudio config
+	install -Dm644 "$srcdir"/pulse-pinephone.conf \
+		"$pkgdir"/etc/pulse/daemon.conf.d/89-pinephone.conf
+
 	# Modem
 	install -Dm755 "$srcdir"/setup-modem.sh \
 		"$pkgdir"/usr/bin/pinephone_setup-modem
@@ -155,6 +162,15 @@ plasma_mobile() {
 	install -Dm644 "$srcdir"/kirigami-lowpower.sh "$subpkgdir"/etc/profile.d/kirigami-lowpower.sh
 }
 
+upower() {
+	install_if="$pkgname=$pkgver-r$pkgrel upower"
+	replaces="upower"
+
+	# Shutdown when PMIC reports critical battery level
+	install -Dm644 "$srcdir"/UPower.conf \
+		"$subpkgdir"/etc/UPower/UPower.conf
+}
+
 shelli() {
 	install_if="$pkgname=$pkgver-r$pkgrel shelli"
 
@@ -184,4 +200,6 @@ f4b5509fd6a8b23f3667f5e7262b3a19c607a37cb9eaf7d0e93eb826d45c26ec12df4810879bacb8
 aef9f00f1d327b11640c4dbcb7b6ad5b0bac3118e262af5d7d6a37d87757559856438c0adea834f03752725876c3f857ed903cdfaaf678459bbcd7633d523ded  HiFi.conf
 e852b48a687f9b2a0eca444aa3d00a1818aead9f5e5d28e070b51c9d6f8ec648e66f1d88e2bfa94d74533f9ffb9aacc1703da2a06693f85fa04ff97fd7528012  PinePhone.conf
 6e226e8dc39a438629f443a33e1ba7ea5f7f1a08b98ec58b2bf97036e549d3ce9898de708020a632f4fd2f9d6540a621331e4d2c406c1e729d073113aff55ec3  VoiceCall.conf
+ed0e03f7e1c0348c06be9a7922414469245604ce813bbf0c8910ef211cb993bbb0d0d4615c9c961d50712415f85d6b73e0cf02780ac784666aac56e4889341e4  UPower.conf
+9c472065b19141dd4c7555869b955de2e679b36e597f9fa3bdac18d0e9460986b0e2fffe1e04751301305f1b6474c1375803afb7d6212eeae91b4905d0bf8ff8  pulse-pinephone.conf
 "

device/main/device-pine64-pinephone/UPower.conf

+# Only the system vendor should modify this file, ordinary users
+# should not have to change anything.
+
+[UPower]
+
+# Enable the Watts Up Pro device.
+#
+# The Watts Up Pro contains a generic FTDI USB device without a specific
+# vendor and product ID. When we probe for WUP devices, we can cause
+# the user to get a perplexing "Device or resource busy" error when
+# attempting to use their non-WUP device.
+#
+# The generic FTDI device is known to also be used on:
+#
+# - Sparkfun FT232 breakout board
+# - Parallax Propeller
+#
+# default=false
+EnableWattsUpPro=false
+
+# Don't poll the kernel for battery level changes.
+#
+# Some hardware will send us battery level changes through
+# events, rather than us having to poll for it. This option
+# allows disabling polling for hardware that sends out events.
+#
+# default=false
+NoPollBatteries=false
+
+# Do we ignore the lid state
+#
+# Some laptops are broken. The lid state is either inverted, or stuck
+# on or off. We can't do much to fix these problems, but this is a way
+# for users to make the laptop panel vanish, a state that might be used
+# by a couple of user-space daemons. On Linux systems, see also
+# logind.conf(5).
+#
+# default=false
+IgnoreLid=false
+
+# Policy for warnings and action based on battery levels
+#
+# Whether battery percentage based policy should be used. The default
+# is to use the time left, change to true to use the percentage, which
+# should work around broken firmwares. It is also more reliable than
+# the time left (frantically saving all your files is going to use more
+# battery than letting it rest for example).
+# default=true
+UsePercentageForPolicy=true
+
+# When UsePercentageForPolicy is true, the levels at which UPower will
+# consider the battery low, critical, or take action for the critical
+# battery level.
+#
+# This will also be used for batteries which don't have time information
+# such as that of peripherals.
+#
+# If any value is invalid, or not in descending order, the defaults
+# will be used.
+#
+# Defaults:
+# PercentageLow=10
+# PercentageCritical=3
+# PercentageAction=2
+PercentageLow=20
+PercentageCritical=17
+PercentageAction=15
+
+# When UsePercentageForPolicy is false, the time remaining at which UPower
+# will consider the battery low, critical, or take action for the critical
+# battery level.
+#
+# If any value is invalid, or not in descending order, the defaults
+# will be used.
+#
+# Defaults:
+# TimeLow=1200
+# TimeCritical=300
+# TimeAction=120
+TimeLow=1200
+TimeCritical=300
+TimeAction=120
+
+# The action to take when "TimeAction" or "PercentageAction" above has been
+# reached for the batteries (UPS or laptop batteries) supplying the computer
+#
+# Possible values are:
+# PowerOff
+# Hibernate
+# HybridSleep
+#
+# If HybridSleep isn't available, Hibernate will be used
+# If Hibernate isn't available, PowerOff will be used
+CriticalPowerAction=PowerOff

device/main/device-pine64-pinephone/pulse-pinephone.conf

+default-sample-rate=48000
+alternate-sample-rate=8000

device/main/device-purism-librem5/00-mesa.sh

 export GDK_GL=gles
+export GST_GL_API=gles2
+export ETNA_MESA_DEBUG=nir

device/main/device-purism-librem5/APKBUILD

@@ -3,8 +3,8 @@
 # Co-Maintainer: Bhushan Shah <bshah@kde.org>
 pkgname=device-purism-librem5
 pkgdesc="Purism Librem 5 Phone"
-pkgver=1.19
-pkgrel=2
+pkgver=1.20
+pkgrel=0
 _confver=36
 _purismrel=1
 # <librem5-base ver>.<purism release>
@@ -127,8 +127,9 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="ef2cce6de4e85b14b4a7dee7fe8175d6ca455db38bfe4453b390ac15ad51240dec583837a8428532db4d99a6cfb060b703a3986584bfedd0f2d44444d2a1c1c1  librem5-base-pureos-36pureos1.tar.gz
-5e0536a53ba5a33af6ddff3a5f5d866c09ae54dd6754e6b17e61fde0b141b3165379a598de562c89568a1de9ae9ae03a4f876c53002b87f09d7b56013345ab27  00-mesa.sh
+sha512sums="
+ef2cce6de4e85b14b4a7dee7fe8175d6ca455db38bfe4453b390ac15ad51240dec583837a8428532db4d99a6cfb060b703a3986584bfedd0f2d44444d2a1c1c1  librem5-base-pureos-36pureos1.tar.gz
+2e72d9a084ecd6c96cafbbd8fda461ae8b2ebd14ffda601d9f36d73f08f04088213de17da078293ddd958d4c76d33148c7af6e252eb0709f6934855a55578509  00-mesa.sh
 8b6fa7b12c15f439c561901f3ffe24a1ef2a0c343401c0a79281060854ab29e08a1fb5e7adae8684b12aa9f535ed99e2dad993dce9724822cb0fbf2497dd86e5  70-wifi-pm.rules
 00355d9ad085a77e157f3c62eb4f1bcac2823d3b341e34d1128edbfb1444fba83e8eacd263ea61da9f6d853f1328ab7fbe5ea63bd08c8a1bc9b8eaf44ae1f1c6  77-mm-broadmobi-port-types.rules
 647cd95872bfa3e533ce2a825f9215315f629c0f2835becd77e3acb07b748a2c662090197de59155ff6e8137165dea877a0b179db4bd8bee3dd3d205f390a656  deviceinfo
@@ -139,4 +140,5 @@ a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f
 8ef4ec7a9e9a4fb801d207e7d94b627aacc9243a93b0ec28e0823a6f44b8102416c040e4ddf499f87bb9dfa960cf6f627b008b79f197f6814b3fd881e18ae8ef  pcscd-librem5-reader.conf
 2618b40eebd3602066ee75ab85cbdbb4cfee498def9879c95a304f05a6eeedf1ab28c5dd9fa5efc8f88c790f49c96458c61d5dfe8a3ca0f96bcc0e244313ab01  pcscd-librem5.initd
 aa06920d47ca3781d76473a8a4efebd243ebb1c1d81e1714ef5ade3fed91e0a7a7113e5fa00c7c77163556745962e57102469517f9ea3ad868bc4033387bf428  uboot-script.cmd
-1cbc65cf2cb8fad4b0332d012a0256a266205b9b64371f5c0dae09dbb7f1e45b254e8c43993b896097e9d7035a72d547d9bce1ab2133addc56a5abdb80b44616  xorg.conf"
+1cbc65cf2cb8fad4b0332d012a0256a266205b9b64371f5c0dae09dbb7f1e45b254e8c43993b896097e9d7035a72d547d9bce1ab2133addc56a5abdb80b44616  xorg.conf
+"

device/main/linux-purism-librem5/0001-bq25890_charger-enter-ship-mode-on-power-off.patch

-From 27212841ea2b3a4ecf0463bb89c101941afcabf8 Mon Sep 17 00:00:00 2001
+From 27afc3e0e791b6dbf0fb2c1ee5073a646089eb59 Mon Sep 17 00:00:00 2001
 From: Clayton Craft <clayton@craftyguy.net>
 Date: Fri, 5 Mar 2021 18:55:28 -0800
 Subject: [PATCH] bq25890_charger: enter ship mode on power off
@@ -16,7 +16,7 @@ bq25890 is *not* used to power off system.
  1 file changed, 56 insertions(+)
 
 diff --git a/drivers/power/supply/bq25890_charger.c b/drivers/power/supply/bq25890_charger.c
-index c33885e4f48c..7360bc51ef64 100644
+index ef3f152e2ba8..4e31a137bcba 100644
 --- a/drivers/power/supply/bq25890_charger.c
 +++ b/drivers/power/supply/bq25890_charger.c
 @@ -40,6 +40,10 @@ static const char *const bq25890_chip_name[] = {
@@ -30,7 +30,7 @@ index c33885e4f48c..7360bc51ef64 100644
  enum bq25890_fields {
  	F_EN_HIZ, F_EN_ILIM, F_IILIM,				     /* Reg00 */
  	F_BHOT, F_BCOLD, F_VINDPM_OFS,				     /* Reg01 */
-@@ -837,6 +841,43 @@ static int bq25890_power_supply_init(struct bq25890_device *bq)
+@@ -928,6 +932,43 @@ static int bq25890_power_supply_init(struct bq25890_device *bq)
  	return PTR_ERR_OR_ZERO(bq->charger);
  }
  
@@ -74,7 +74,7 @@ index c33885e4f48c..7360bc51ef64 100644
  static void bq25890_usb_work(struct work_struct *data)
  {
  	int ret;
-@@ -1141,6 +1182,17 @@ static int bq25890_probe(struct i2c_client *client,
+@@ -1232,6 +1273,17 @@ static int bq25890_probe(struct i2c_client *client,
  		goto battery_fail;
  	}
  
@@ -92,7 +92,7 @@ index c33885e4f48c..7360bc51ef64 100644
  	return 0;
  
  battery_fail:
-@@ -1164,6 +1216,10 @@ static int bq25890_remove(struct i2c_client *client)
+@@ -1255,6 +1307,10 @@ static int bq25890_remove(struct i2c_client *client)
  	/* reset all registers to default values */
  	bq25890_chip_reset(bq);
  

device/main/linux-purism-librem5/0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch

-From 227faf14f8caabd3859f319bc686c9b04c752060 Mon Sep 17 00:00:00 2001
+From 8d4a1c39146442252ac5666889eab7f0160779b0 Mon Sep 17 00:00:00 2001
 From: Angus Ainslie <angus@akkea.ca>
 Date: Sun, 25 Apr 2021 07:49:49 -0700
 Subject: [PATCH] arm64: dts: imx8mq-librem5.dtsi: adjust the usdhc bus speeds
@@ -12,10 +12,10 @@ Signed-off-by: Angus Ainslie <angus@akkea.ca>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
-index 23a853099b8d..1dd25f26b089 100644
+index b2345dd6cc17..8b3d310f976d 100644
 --- a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
 +++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
-@@ -1721,7 +1721,7 @@ mass-storage@1 {
+@@ -1723,7 +1723,7 @@ mass-storage@1 {
  
  &usdhc1 {
  	assigned-clocks = <&clk IMX8MQ_CLK_USDHC1>;
@@ -24,7 +24,7 @@ index 23a853099b8d..1dd25f26b089 100644
  	pinctrl-names = "default", "state_100mhz", "state_200mhz";
  	pinctrl-0 = <&pinctrl_usdhc1>;
  	pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
-@@ -1748,6 +1748,7 @@ &usdhc2 {
+@@ -1750,6 +1750,7 @@ &usdhc2 {
  	cap-sdio-irq;
  	keep-power-in-suspend;
  	wakeup-source;

device/main/linux-purism-librem5/0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch

-From 8a8170ee8699943bfdc58e13e6f3222faa6011b3 Mon Sep 17 00:00:00 2001
+From 009aee6922803a9f21fd7d003676ebbfcfb92f4b Mon Sep 17 00:00:00 2001
 From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
 Date: Thu, 30 Jul 2020 00:20:09 +0200
 Subject: [PATCH] imx8mq-librem5-r3: Set the CPU voltage to 1.0V when running
@@ -9,10 +9,10 @@ Subject: [PATCH] imx8mq-librem5-r3: Set the CPU voltage to 1.0V when running
  1 file changed, 6 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dts b/arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dts
-index 16e09c8851b1..62f1444e4c0d 100644
+index dda383ec81d3..e6c501f7f24c 100644
 --- a/arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dts
 +++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dts
-@@ -79,3 +79,9 @@ MX8MQ_IOMUXC_UART4_TXD_GPIO5_IO29	0x83
+@@ -103,3 +103,9 @@ MX8MQ_IOMUXC_UART4_TXD_GPIO5_IO29	0x83
  &proximity {
  	proximity-near-level = <25>;
  };

device/main/linux-purism-librem5/0004-arm64-dts-imx8mq-disable-SuperSpeed-instances-in-par.patch

-From f90db476ea4681224510cee0b160c9d7de968fd2 Mon Sep 17 00:00:00 2001
+From 8675304fbfd15484c0ff9ecb7572596bf49449d2 Mon Sep 17 00:00:00 2001
 From: Clayton Craft <clayton@craftyguy.net>
 Date: Sun, 25 Apr 2021 18:57:45 -0700
 Subject: [PATCH] arm64: dts: imx8mq: disable SuperSpeed instances in park mode
@@ -14,10 +14,10 @@ https://source.puri.sm/Librem5/linux-next/-/issues/197#note_114221
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
-index 1dd25f26b089..07aa83b9370f 100644
+index 8b3d310f976d..8d346cfdfa07 100644
 --- a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
 +++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
-@@ -1704,6 +1704,7 @@ &usb_dwc3_1 {
+@@ -1706,6 +1706,7 @@ &usb_dwc3_1 {
  	status = "okay";
  	#address-cells = <1>;
  	#size-cells = <0>;