Bluetooth: hci_uart: Update Broadcom UART setup

Use btbcm helpers to perform controller setup.
Perform host UART reset to init speed between btbcm_patchram() and
btbcm_finalize(). This may be need because firmware loading may have
reseted controller UART to init speed.

Signed-off-by: Frederic Danis <frederic.danis@linux.intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 8653d12..0704522 100644 (file)
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -80,11 +80,39 @@ static int bcm_flush(struct hci_uart *hu)
 
 static int bcm_setup(struct hci_uart *hu)
 {
+       char fw_name[64];
+       const struct firmware *fw;
+       int err;
+
        BT_DBG("hu %p", hu);
 
        hu->hdev->set_bdaddr = btbcm_set_bdaddr;
 
-       return btbcm_setup_patchram(hu->hdev);
+       err = btbcm_initialize(hu->hdev, fw_name, sizeof(fw_name));
+       if (err)
+               return err;
+
+       err = request_firmware(&fw, fw_name, &hu->hdev->dev);
+       if (err < 0) {
+               BT_INFO("%s: BCM: Patch %s not found", hu->hdev->name, fw_name);
+               return 0;
+       }
+
+       err = btbcm_patchram(hu->hdev, fw);
+       if (err) {
+               BT_INFO("%s: BCM: Patch failed (%d)", hu->hdev->name, err);
+               goto finalize;
+       }
+
+       if (hu->proto->init_speed)
+               hci_uart_set_baudrate(hu, hu->proto->init_speed);
+
+finalize:
+       release_firmware(fw);
+
+       err = btbcm_finalize(hu->hdev);
+
+       return err;
 }
 
 static const struct h4_recv_pkt bcm_recv_pkts[] = {