From 56a0531ad219008b73ffa4598ab0fa67ffd6844d Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Sat, 20 Mar 2021 00:46:34 -0700 Subject: [PATCH] linux-purism-librem5: build led-pattern driver into kernel (MR 2043) There's a race condition between when the pwmled device is initialized, which kicks off a feedbackd udev rule that configures the led trigger to 'pattern', and when ledtrig_pattern actually loads. It seems to mostly load after the rule runs, so the trigger is never set to 'pattern' on boot. This removes the race by building the ledtrig_pattern driver into the kernel. [ci:skip-build] Already build successfully in CI --- device/community/linux-purism-librem5/APKBUILD | 4 ++-- .../linux-purism-librem5/config-purism-librem5.aarch64 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/device/community/linux-purism-librem5/APKBUILD b/device/community/linux-purism-librem5/APKBUILD index afa39004f..e7d8f71f1 100644 --- a/device/community/linux-purism-librem5/APKBUILD +++ b/device/community/linux-purism-librem5/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Clayton Craft pkgname=linux-purism-librem5 pkgver=5.11.4 -pkgrel=2 +pkgrel=3 _purismrel=1 # . _purismver=${pkgver}pureos$_purismrel @@ -79,4 +79,4 @@ sha512sums="d2e0f49403413f581aee6e47e021cb04fc003fbf821349c188a0c6a57561ba702c32 5baae99010bde62e253fdd56f21ba096c217ba2ab9c367c80b34bc0f445a79a8fb8b5d14682f71ad6061d73c81fc16a608f4be037d792978dbbaf74267844260 0001-Revert-arm64-dts-librem5-Drop-separte-DP-device-tree.patch 1a12f74895b0fc710792e3881f23754a8eb92d25b11a2751db007a1b08f72729043d1e824096c97dc795b8e33300274887b428997ddaacf4b61f52ef3bd78ce5 0002-bq25890_charger-enter-ship-mode-on-power-off.patch 00286a7ea3d3167150eca1025f271bb76e05d8a47c481879b1322ec9e88250c365b1b0ddcc8140ccc9b8f6138ffec843f184645c0c7d4ff11f75c988f5c4945c 0003-Revert-redpine-Clean-up-loop-in-the-interrupt-handler.patch -d27cc078f49563fa935d104846017c9ba28e859d5231d202c68b6438e25f381747206fe0be86d323bd50dc457e67b02a52eb60a845c35bd33d7f2367893781d2 config-purism-librem5.aarch64" +07ce9dfb837e8a1ae10bc0edbbca107a3b12a2e5e2935fa9a1aa24c8f31e3c564685f2cb4a7b231960bdc666bcead1a946645ec7615b985d5c3d0cf6babaf098 config-purism-librem5.aarch64" diff --git a/device/community/linux-purism-librem5/config-purism-librem5.aarch64 b/device/community/linux-purism-librem5/config-purism-librem5.aarch64 index 4b3aa8e8d..9338fb0ad 100644 --- a/device/community/linux-purism-librem5/config-purism-librem5.aarch64 +++ b/device/community/linux-purism-librem5/config-purism-librem5.aarch64 @@ -2,10 +2,10 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm64 5.11.4 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.2.1_pre1) 10.2.1 20201203" +CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.2.1_git20210318) 10.2.1 20210318" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=100201 -CONFIG_LD_VERSION=235010000 +CONFIG_LD_VERSION=235020000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y @@ -4805,7 +4805,7 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=m CONFIG_LEDS_TRIGGER_CAMERA=m CONFIG_LEDS_TRIGGER_PANIC=y CONFIG_LEDS_TRIGGER_NETDEV=m -CONFIG_LEDS_TRIGGER_PATTERN=m +CONFIG_LEDS_TRIGGER_PATTERN=y CONFIG_LEDS_TRIGGER_AUDIO=m # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set