diff -Nru bluez-5.53/debian/changelog bluez-5.53/debian/changelog --- bluez-5.53/debian/changelog 2020-04-03 01:46:35.000000000 -0500 +++ bluez-5.53/debian/changelog 2021-03-15 14:25:22.000000000 -0500 @@ -1,3 +1,9 @@ +bluez (5.53-0ubuntu3.1) focal; urgency=medium + + * Add support for the pi 400 (LP: #1903048) + + -- William 'jawn-smith' Wilson Mon, 15 Mar 2021 19:25:22 +0000 + bluez (5.53-0ubuntu3) focal; urgency=medium * debian/patches/ubuntu_error_restart.patch: diff -Nru bluez-5.53/debian/patches/raspi-bcm43xx-3wire.patch bluez-5.53/debian/patches/raspi-bcm43xx-3wire.patch --- bluez-5.53/debian/patches/raspi-bcm43xx-3wire.patch 1969-12-31 18:00:00.000000000 -0600 +++ bluez-5.53/debian/patches/raspi-bcm43xx-3wire.patch 2021-03-15 14:25:22.000000000 -0500 @@ -0,0 +1,20 @@ +Author: Simon Long +Forwarded: https://patchwork.kernel.org/project/bluetooth/patch/20201218190609.107898-2-dave.jones@canonical.com/ +Last-Update: 2017-04-05 +Description: Patches to add BCM43xx 3-wire variant + This patch adds the bcm43xx-3wire variant to the hciattach tool; this is + for use when the mini-UART (which lacks flow-control) is used instead of the + PL011 UART to drive the bluetooth module + +--- a/tools/hciattach.c ++++ b/tools/hciattach.c +@@ -1091,6 +1091,9 @@ + { "bcm43xx", 0x0000, 0x0000, HCI_UART_H4, 115200, 3000000, + FLOW_CTL, DISABLE_PM, NULL, bcm43xx, NULL }, + ++ { "bcm43xx-3wire", 0x0000, 0x0000, HCI_UART_3WIRE, 115200, 3000000, ++ 0, DISABLE_PM, NULL, bcm43xx, NULL }, ++ + { "ath3k", 0x0000, 0x0000, HCI_UART_ATH3K, 115200, 115200, + FLOW_CTL, DISABLE_PM, NULL, ath3k_ps, ath3k_pm }, + diff -Nru bluez-5.53/debian/patches/raspi-bcm43xx-load-firmware.patch bluez-5.53/debian/patches/raspi-bcm43xx-load-firmware.patch --- bluez-5.53/debian/patches/raspi-bcm43xx-load-firmware.patch 1969-12-31 18:00:00.000000000 -0600 +++ bluez-5.53/debian/patches/raspi-bcm43xx-load-firmware.patch 2021-03-15 14:25:22.000000000 -0500 @@ -0,0 +1,31 @@ +Author: Simon Long +Forwarded: https://patchwork.kernel.org/project/bluetooth/patch/20201218190609.107898-4-dave.jones@canonical.com/ +Last-Update: 2020-12-18 +Description: Patches for loading the bcm43xx firmware + This patch corrects the location of the firmware from /etc/firmware to + /lib/firmware, and disables setting the UART interface speed *before* loading + the firmware (a later call sets the speed of the interface as requested). It + also introduces a short wait after the firmware load before the module is + reset. + +--- a/tools/hciattach_bcm43xx.c ++++ b/tools/hciattach_bcm43xx.c +@@ -44,7 +44,7 @@ + #include "hciattach.h" + + #ifndef FIRMWARE_DIR +-#define FIRMWARE_DIR "/etc/firmware" ++#define FIRMWARE_DIR "/lib/firmware" + #endif + + #define FW_EXT ".hcd" +@@ -369,9 +369,6 @@ + if (bcm43xx_locate_patch(FIRMWARE_DIR, chip_name, fw_path)) { + fprintf(stderr, "Patch not found, continue anyway\n"); + } else { +- if (bcm43xx_set_speed(fd, ti, speed)) +- return -1; +- + if (bcm43xx_load_firmware(fd, fw_path)) + return -1; + diff -Nru bluez-5.53/debian/patches/raspi-cypress-305-bdaddr.patch bluez-5.53/debian/patches/raspi-cypress-305-bdaddr.patch --- bluez-5.53/debian/patches/raspi-cypress-305-bdaddr.patch 1969-12-31 18:00:00.000000000 -0600 +++ bluez-5.53/debian/patches/raspi-cypress-305-bdaddr.patch 2021-03-15 14:25:22.000000000 -0500 @@ -0,0 +1,23 @@ +From: Phil Elwell +Forwarded: https://patchwork.kernel.org/project/bluetooth/patch/20201218190609.107898-3-dave.jones@canonical.com/ +Subject: Patch Cypress 305 devices to behave as Broadcom devices + +--- + tools/bdaddr.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/bdaddr.c b/tools/bdaddr.c +index 952e99077..55fad4b46 100644 +--- a/tools/bdaddr.c ++++ b/tools/bdaddr.c +@@ -316,6 +316,7 @@ static struct { + { 48, st_write_bd_addr, generic_reset_device }, + { 57, ericsson_write_bd_addr, generic_reset_device }, + { 72, mrvl_write_bd_addr, generic_reset_device }, ++ { 305, bcm_write_bd_addr, generic_reset_device }, + { 65535, NULL, NULL }, + }; + +-- +2.25.1 + diff -Nru bluez-5.53/debian/patches/series bluez-5.53/debian/patches/series --- bluez-5.53/debian/patches/series 2020-04-03 01:43:11.000000000 -0500 +++ bluez-5.53/debian/patches/series 2021-03-15 14:25:22.000000000 -0500 @@ -16,3 +16,6 @@ CVE-2020-0556-3.patch CVE-2020-0556-4.patch ubuntu_error_restart.patch +raspi-bcm43xx-3wire.patch +raspi-bcm43xx-load-firmware.patch +raspi-cypress-305-bdaddr.patch