Without updating the patchram, the BCM4354 does not support a higher
operating speed. The normal bcm_setup follows the correct order
(init_speed, patchram and then oper_speed) but the serdev driver will
set the operating speed before calling the hu->setup function. Thus,
for the BCM4354, disallow setting the operating speed before patchram.
Signed-off-by: Abhishek Pandit-Subedi <[email protected]>
---
drivers/bluetooth/hci_bcm.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 0f851c0dde7f..4fe66e52927d 100644
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -1167,7 +1167,7 @@ static int bcm_remove(struct platform_device *pdev)
return 0;
}
-static const struct hci_uart_proto bcm_proto = {
+static struct hci_uart_proto bcm_proto = {
.id = HCI_UART_BCM,
.name = "Broadcom",
.manufacturer = 15,
@@ -1371,6 +1371,22 @@ static struct platform_driver bcm_driver = {
},
};
+static int bcm_check_disallow_set_baudrate(struct serdev_device *serdev)
+{
+ const char *compatible = of_get_property(serdev->dev.of_node,
+ "compatible", NULL);
+
+ if (compatible) {
+ /* BCM4354 can't run at full speed before patchram. Disallow
+ * externally setting operating speed.
+ */
+ if (!strcmp(compatible, "brcm,bcm43540-bt"))
+ return 1;
+ }
+
+ return 0;
+}
+
static int bcm_serdev_probe(struct serdev_device *serdev)
{
struct bcm_device *bcmdev;
@@ -1408,6 +1424,9 @@ static int bcm_serdev_probe(struct serdev_device *serdev)
if (err)
dev_err(&serdev->dev, "Failed to power down\n");
+ if (bcm_check_disallow_set_baudrate(serdev))
+ bcm_proto.set_baudrate = NULL;
+
return hci_uart_register_device(&bcmdev->serdev_hu, &bcm_proto);
}
--
2.24.0.rc1.363.gb1bccd3e3d-goog