Merge tag '9p-for-5.4' of git://github.com/martinetd/linux

[linux.git] / drivers / bluetooth / hci_bcm.c

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index ae2624fce913471bf4c8b4a25f90fcffc0a8b965..7646636f2d183d5c38cdf8d5412afd2373d9886d 100644 (file)
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -260,7 +260,7 @@ static int bcm_gpio_set_power(struct bcm_device *dev, bool powered)
        }
 
        /* wait for device to power on and come out of reset */
-       usleep_range(10000, 20000);
+       usleep_range(100000, 120000);
 
        dev->res_enabled = powered;
 
@@ -824,6 +824,21 @@ static int bcm_resume(struct device *dev)
 }
 #endif
 
+/* Some firmware reports an IRQ which does not work (wrong pin in fw table?) */
+static const struct dmi_system_id bcm_broken_irq_dmi_table[] = {
+       {
+               .ident = "Meegopad T08",
+               .matches = {
+                       DMI_EXACT_MATCH(DMI_BOARD_VENDOR,
+                                       "To be filled by OEM."),
+                       DMI_EXACT_MATCH(DMI_BOARD_NAME, "T3 MRD"),
+                       DMI_EXACT_MATCH(DMI_BOARD_VERSION, "V1.1"),
+               },
+       },
+       { }
+};
+
+#ifdef CONFIG_ACPI
 static const struct acpi_gpio_params first_gpio = { 0, 0, false };
 static const struct acpi_gpio_params second_gpio = { 1, 0, false };
 static const struct acpi_gpio_params third_gpio = { 2, 0, false };
@@ -842,21 +857,6 @@ static const struct acpi_gpio_mapping acpi_bcm_int_first_gpios[] = {
        { },
 };
 
-/* Some firmware reports an IRQ which does not work (wrong pin in fw table?) */
-static const struct dmi_system_id bcm_broken_irq_dmi_table[] = {
-       {
-               .ident = "Meegopad T08",
-               .matches = {
-                       DMI_EXACT_MATCH(DMI_BOARD_VENDOR,
-                                       "To be filled by OEM."),
-                       DMI_EXACT_MATCH(DMI_BOARD_NAME, "T3 MRD"),
-                       DMI_EXACT_MATCH(DMI_BOARD_VERSION, "V1.1"),
-               },
-       },
-       { }
-};
-
-#ifdef CONFIG_ACPI
 static int bcm_resource(struct acpi_resource *ares, void *data)
 {
        struct bcm_device *dev = data;
@@ -1419,6 +1419,7 @@ static void bcm_serdev_remove(struct serdev_device *serdev)
 #ifdef CONFIG_OF
 static const struct of_device_id bcm_bluetooth_of_match[] = {
        { .compatible = "brcm,bcm20702a1" },
+       { .compatible = "brcm,bcm4345c5" },
        { .compatible = "brcm,bcm4330-bt" },
        { .compatible = "brcm,bcm43438-bt" },
        { },