mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 22:47:56 +00:00
8c405cdccc
The patches were generated from the RPi repo with the following command: git format-patch v6.6.34..rpi-6.1.y Some patches needed rebasing and, as usual, the applied and reverted, wireless drivers, Github workflows, READMEs and defconfigs patches were removed. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
46 lines
2.3 KiB
Diff
46 lines
2.3 KiB
Diff
From 8bf18c4f8b7fe9463259cc494ab47b71d13a9181 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Thu, 6 Apr 2023 10:38:40 +0100
|
|
Subject: [PATCH 0442/1085] Bluetooth: hci_bcm: Add more invalid BDADDRs
|
|
|
|
The kernel needs to recognise the default BDADDRs used by the Bluetooth
|
|
modems, so add a few more that we care about.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
drivers/bluetooth/btbcm.c | 8 +++++++-
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/bluetooth/btbcm.c
|
|
+++ b/drivers/bluetooth/btbcm.c
|
|
@@ -24,12 +24,15 @@
|
|
#define BDADDR_BCM20702A1 (&(bdaddr_t) {{0x00, 0x00, 0xa0, 0x02, 0x70, 0x20}})
|
|
#define BDADDR_BCM2076B1 (&(bdaddr_t) {{0x79, 0x56, 0x00, 0xa0, 0x76, 0x20}})
|
|
#define BDADDR_BCM43430A0 (&(bdaddr_t) {{0xac, 0x1f, 0x12, 0xa0, 0x43, 0x43}})
|
|
-#define BDADDR_BCM43430A1 (&(bdaddr_t) {{0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa}})
|
|
+#define BDADDR_BCM43430A1 (&(bdaddr_t) {{0xac, 0x1f, 0x12, 0xa1, 0x43, 0x43}})
|
|
+#define BDADDR_BCM43430B0 (&(bdaddr_t) {{0xac, 0x1f, 0x37, 0xb0, 0x43, 0x43}})
|
|
#define BDADDR_BCM4324B3 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb3, 0x24, 0x43}})
|
|
#define BDADDR_BCM4330B1 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb1, 0x30, 0x43}})
|
|
#define BDADDR_BCM4334B0 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb0, 0x34, 0x43}})
|
|
+#define BDADDR_BCM4345C0 (&(bdaddr_t) {{0xac, 0x1f, 0x00, 0xc0, 0x45, 0x43}})
|
|
#define BDADDR_BCM4345C5 (&(bdaddr_t) {{0xac, 0x1f, 0x00, 0xc5, 0x45, 0x43}})
|
|
#define BDADDR_BCM43341B (&(bdaddr_t) {{0xac, 0x1f, 0x00, 0x1b, 0x34, 0x43}})
|
|
+#define BDADDR_BCM43438 (&(bdaddr_t) {{0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa}})
|
|
|
|
#define BCM_FW_NAME_LEN 64
|
|
#define BCM_FW_NAME_COUNT_MAX 4
|
|
@@ -126,9 +129,12 @@ int btbcm_check_bdaddr(struct hci_dev *h
|
|
!bacmp(&bda->bdaddr, BDADDR_BCM4324B3) ||
|
|
!bacmp(&bda->bdaddr, BDADDR_BCM4330B1) ||
|
|
!bacmp(&bda->bdaddr, BDADDR_BCM4334B0) ||
|
|
+ !bacmp(&bda->bdaddr, BDADDR_BCM4345C0) ||
|
|
!bacmp(&bda->bdaddr, BDADDR_BCM4345C5) ||
|
|
!bacmp(&bda->bdaddr, BDADDR_BCM43430A0) ||
|
|
!bacmp(&bda->bdaddr, BDADDR_BCM43430A1) ||
|
|
+ !bacmp(&bda->bdaddr, BDADDR_BCM43430B0) ||
|
|
+ !bacmp(&bda->bdaddr, BDADDR_BCM43438) ||
|
|
!bacmp(&bda->bdaddr, BDADDR_BCM43341B)) {
|
|
/* Try falling back to BDADDR EFI variable */
|
|
if (btbcm_set_bdaddr_from_efi(hdev) != 0) {
|