From 4fc0f7eec6e64126df1d97dbc026061484244538 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Fri, 3 Mar 2023 08:28:53 -0800 Subject: [PATCH] purism-librem5: re-enable PM for the Sparklan module (MR 3921) According to Purism, PM on the Sparklan WiFi module works now with recent kernels, the upstream bug referenced earlier (see diff) was closed. Note that this has no effect on the Redpine WiFi module, which is the default module shipped with the L5. [ci:skip-build] already built successfully in CI --- device/main/device-purism-librem5/APKBUILD | 10 +--------- .../device-purism-librem5/brcmfmac-no-powersave.conf | 4 ---- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 device/main/device-purism-librem5/brcmfmac-no-powersave.conf diff --git a/device/main/device-purism-librem5/APKBUILD b/device/main/device-purism-librem5/APKBUILD index acd6c2422..8244751ba 100644 --- a/device/main/device-purism-librem5/APKBUILD +++ b/device/main/device-purism-librem5/APKBUILD @@ -4,7 +4,7 @@ # Co-Maintainer: Newbyte pkgname=device-purism-librem5 pkgdesc="Purism Librem 5 Phone" -pkgver=1.41 +pkgver=1.42 pkgrel=0 _confver=56 _purismrel=1 @@ -46,7 +46,6 @@ source=" l5-ship-mode.initd l5-lockdown-support.initd org.freedesktop.GeoClue2.service - brcmfmac-no-powersave.conf " subpackages=" $pkgname-camera @@ -178,12 +177,6 @@ package() { install -Dm755 "$srcdir"/l5-lockdown-support.initd \ "$pkgdir"/etc/init.d/l5-lockdown-support - - # disable PM for brcmfmac wifi / Sparklan WLAN - # see: https://source.puri.sm/Librem5/linux/-/issues/404 - install -D -m644 "$srcdir"/brcmfmac-no-powersave.conf \ - -t "$pkgdir"/etc/NetworkManager/conf.d - devicepkg_package $startdir $pkgname } @@ -212,5 +205,4 @@ b45749fcddfd65a302b502bcabfa5828d1b63e45d844fd50e44009a756b919db20fe9526102947c0 c723764d507ccd4b04aa5ce79b1d1ebc131873cdc37a943cb0f92b8a08a3c69eb9e0d31fcd4589fd8c40a9676bae9897e4f12ec2ebe4db8214ac85669ef35a53 l5-ship-mode.initd f4b314d553655f7975445ac0a33099923e20dabb082c07e2cf6a78e4118c143d777dd4ad2c09cbc388600bdefe8deb3073fbd15b238772ddf09c66ac46415590 l5-lockdown-support.initd fd91bcd8cecd509587f0a26d454157a1df094d2d86c75329d1002e9474946494d4d1b5407e055fbd5f21e22394eeb1bbd4b3439ae6925db50a3427b4fac101cf org.freedesktop.GeoClue2.service -7e679cbd0970d017790e4217a027128a0c99c20a1b757cbce49d92eb0df9fa54148017313dc27bcd1029ab6c904f98c5c4032a1f5db7849401a55cb2e564add1 brcmfmac-no-powersave.conf " diff --git a/device/main/device-purism-librem5/brcmfmac-no-powersave.conf b/device/main/device-purism-librem5/brcmfmac-no-powersave.conf deleted file mode 100644 index 174e4b53f..000000000 --- a/device/main/device-purism-librem5/brcmfmac-no-powersave.conf +++ /dev/null @@ -1,4 +0,0 @@ -[connection-wifi-brcmfmac] -match-device=driver:brcmfmac -# 2 = disable powersave -wifi.powersave=2