1. Add comment about reset method types.
2. Minor indentation and typo fixes.
Signed-off-by: Kiran K <kiran.k@xxxxxxxxx>
---
drivers/bluetooth/btintel.c | 8 ++++++--
drivers/bluetooth/btusb.c | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
index 1110289ccd02..000ab44c303d 100644
--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -2500,10 +2500,14 @@ static void btintel_set_dsm_reset_method(struct hci_dev *hdev,
{
struct btintel_data *data = hci_get_priv(hdev);
acpi_handle handle = ACPI_HANDLE(GET_HCIDEV_DEV(hdev));
- u8 reset_payload[4] = {0x01, 0x00, 0x01, 0x00};
+ u8 reset_payload[4] = { 0x01, 0x00, 0x01, 0x00 };
union acpi_object *obj, argv4;
enum {
+ /* supported from TigerLake platform onwards on both discrete
+ * and integrated solutions
+ */
RESET_TYPE_WDISABLE2,
+ /* supported from MeteorLake platform with GalePeak2 NIC only */
RESET_TYPE_VSEC
};
@@ -2533,7 +2537,7 @@ static void btintel_set_dsm_reset_method(struct hci_dev *hdev,
return;
}
argv4.integer.type = ACPI_TYPE_INTEGER;
- /* delay required to toggle BT power */
+ /* delay between WDISABLE2 pin assertion and deassertion */
argv4.integer.value = 160;
obj = acpi_evaluate_dsm(handle, &btintel_guid_dsm, 0,
DSM_SET_WDISABLE2_DELAY, &argv4);
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 1c0879601735..34659255a14f 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -864,7 +864,7 @@ static void btusb_intel_cmd_timeout(struct hci_dev *hdev)
if (intel_data->acpi_reset_method) {
if (test_and_set_bit(INTEL_ACPI_RESET_ACTIVE, intel_data->flags)) {
- bt_dev_err(hdev, "acpi: last reset failed ? Not resetting again");
+ bt_dev_err(hdev, "acpi: last reset failed? Not resetting again");
return;
}
--
2.25.1
