Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[platform/kernel/linux-starfive.git] / drivers / bluetooth / btmtksdio.c

diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
index bff095b..c7ab7a2 100644 (file)
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -685,7 +685,7 @@ static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)
        const u8 *fw_ptr;
        size_t fw_size;
        int err, dlen;
-       u8 flag;
+       u8 flag, param;
 
        err = request_firmware(&fw, fwname, &hdev->dev);
        if (err < 0) {
@@ -693,6 +693,20 @@ static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)
                return err;
        }
 
+       /* Power on data RAM the firmware relies on. */
+       param = 1;
+       wmt_params.op = MTK_WMT_FUNC_CTRL;
+       wmt_params.flag = 3;
+       wmt_params.dlen = sizeof(param);
+       wmt_params.data = &param;
+       wmt_params.status = NULL;
+
+       err = mtk_hci_wmt_sync(hdev, &wmt_params);
+       if (err < 0) {
+               bt_dev_err(hdev, "Failed to power on data RAM (%d)", err);
+               return err;
+       }
+
        fw_ptr = fw->data;
        fw_size = fw->size;