From 933688fb850600758e554073dded0fe3f08bbafc Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair@alistair23.me> Date: Tue, 25 Jun 2024 21:56:53 +1000 Subject: [PATCH] device-purism-librem5: Run hciattach for Bluetooth (MR 5281) This gets Bluetooth working for the Sparklan card. btattach doesn't work on the Librem5 at the moment (see [1]) so even though it's deprecated let's use hciattach to get things working. 1: https://source.puri.sm/Librem5/librem5-base/-/issues/76 Signed-off-by: Alistair Francis <alistair@alistair23.me> [ci:skip-build] already built successfully in CI --- device/main/device-purism-librem5/APKBUILD | 7 ++++--- device/main/device-purism-librem5/l5-brcm-bt-enable.initd | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/device/main/device-purism-librem5/APKBUILD b/device/main/device-purism-librem5/APKBUILD index ab1dd01b370..f4c312dade9 100644 --- a/device/main/device-purism-librem5/APKBUILD +++ b/device/main/device-purism-librem5/APKBUILD @@ -3,8 +3,8 @@ # Co-Maintainer: Newbyte <newbyte@postmarketos.org> # Contributor: Clayton Craft <clayton@craftyguy.net> pkgname=device-purism-librem5 -pkgver=3 -pkgrel=1 +pkgver=4 +pkgrel=0 _confver=64 _purismrel=1 # <librem5-base ver>.<purism release> @@ -17,6 +17,7 @@ options="!check !archcheck" depends=" alsa-ucm-conf bluez + bluez-deprecated bm818-tools gnss-share i2c-tools @@ -206,7 +207,7 @@ a0740e405781ec6ef765fdc9f5700c95adbb241c45c97b9384ba68cdece662cb216ca5918640042f 1cbc65cf2cb8fad4b0332d012a0256a266205b9b64371f5c0dae09dbb7f1e45b254e8c43993b896097e9d7035a72d547d9bce1ab2133addc56a5abdb80b44616 xorg.conf fad386071fc45f9880a94cc8004fabd5d98b3e6a12606c98d8e72e0208f22ab54f03b921f5967a959782507e2bff67d2fa92e46d8cd242011a3afcdbda529279 70-librem5-xwayland-accel.sh b45749fcddfd65a302b502bcabfa5828d1b63e45d844fd50e44009a756b919db20fe9526102947c0f0dfcdffe4a037e5050fe1b24fb915933ce0837f49759378 0001-udev-cameras-use-correct-path-for-modprobe-on-Alpine.patch -d9ebb7acddce8005909505b245140913ea3096a3ab8658ecbe2bf905953ba51aed4188b1d006d4d5bfd10c5e0ebca0150fec67d8c6d156d105021e9e4598b878 l5-brcm-bt-enable.initd +177ec87ec1f110d7c4253a20375c6771c6cfac41057b02bd673caea5399a799a59c5e087037fccf7a104447e6890499a2194aa34bab14df203fa95168ced75d7 l5-brcm-bt-enable.initd f4b314d553655f7975445ac0a33099923e20dabb082c07e2cf6a78e4118c143d777dd4ad2c09cbc388600bdefe8deb3073fbd15b238772ddf09c66ac46415590 l5-lockdown-support.initd c723764d507ccd4b04aa5ce79b1d1ebc131873cdc37a943cb0f92b8a08a3c69eb9e0d31fcd4589fd8c40a9676bae9897e4f12ec2ebe4db8214ac85669ef35a53 l5-ship-mode.initd e089b0c4320c8cb5a6bd1e85f12b6afb24d035958f2bdc7a8ed2cee5b0f379e6fdfad876d8d22c03c9cb0576b4aa7c20c3e9986ba8147500add6d93b44e5f266 modemmanager.conf diff --git a/device/main/device-purism-librem5/l5-brcm-bt-enable.initd b/device/main/device-purism-librem5/l5-brcm-bt-enable.initd index 7ca2bac8f44..6ab72ecf36f 100644 --- a/device/main/device-purism-librem5/l5-brcm-bt-enable.initd +++ b/device/main/device-purism-librem5/l5-brcm-bt-enable.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run name="Purism Librem 5 Sparklan brcm bluetooth enabler" supervisor=supervise-daemon -command="/usr/bin/btattach" -command_args="-B /dev/ttymxc3 -P bcm" +command="/usr/bin/hciattach" +command_args="-s 115200 /dev/ttymxc3 bcm43xx 1500000" -- GitLab