46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
|
From 878e850ce509e875624c703e4cf3c5ae0b66aa15 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Clayton Craft <clayton@craftyguy.net>
|
||
|
|
Date: Wed, 13 Mar 2024 09:31:55 -0700
|
||
|
|
Subject: [PATCH] Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode
|
||
|
|
exists in DT"
|
||
|
|
|
||
|
|
This reverts commit 7dcd3e014aa7faeeaf4047190b22d8a19a0db696.
|
||
|
|
---
|
||
|
|
drivers/bluetooth/hci_qca.c | 13 +------------
|
||
|
|
1 file changed, 1 insertion(+), 12 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
|
||
|
|
index edd2a81b4d5e..f989c05f8177 100644
|
||
|
|
--- a/drivers/bluetooth/hci_qca.c
|
||
|
|
+++ b/drivers/bluetooth/hci_qca.c
|
||
|
|
@@ -7,7 +7,6 @@
|
||
|
|
*
|
||
|
|
* Copyright (C) 2007 Texas Instruments, Inc.
|
||
|
|
* Copyright (c) 2010, 2012, 2018 The Linux Foundation. All rights reserved.
|
||
|
|
- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||
|
|
*
|
||
|
|
* Acknowledgements:
|
||
|
|
* This file is based on hci_ll.c, which was...
|
||
|
|
@@ -1904,17 +1903,7 @@ static int qca_setup(struct hci_uart *hu)
|
||
|
|
case QCA_WCN6750:
|
||
|
|
case QCA_WCN6855:
|
||
|
|
case QCA_WCN7850:
|
||
|
|
-
|
||
|
|
- /* Set BDA quirk bit for reading BDA value from fwnode property
|
||
|
|
- * only if that property exist in DT.
|
||
|
|
- */
|
||
|
|
- if (fwnode_property_present(dev_fwnode(hdev->dev.parent), "local-bd-address")) {
|
||
|
|
- set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
|
||
|
|
- bt_dev_info(hdev, "setting quirk bit to read BDA from fwnode later");
|
||
|
|
- } else {
|
||
|
|
- bt_dev_dbg(hdev, "local-bd-address` is not present in the devicetree so not setting quirk bit for BDA");
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
+ set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
|
||
|
|
hci_set_aosp_capable(hdev);
|
||
|
|
|
||
|
|
ret = qca_read_soc_version(hdev, &ver, soc_type);
|
||
|
|
--
|
||
|
|
2.44.0
|
||
|
|
|