diff options
Diffstat (limited to 'patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch')
-rw-r--r-- | patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch b/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch index df1b1654..76e90f08 100644 --- a/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch +++ b/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch @@ -21,27 +21,27 @@ if (!powered && !IS_ERR(dev->clk) && dev->clk_enabled) clk_disable(dev->clk); -@@ -347,7 +351,9 @@ static int bcm_suspend(struct device *de +@@ -352,7 +356,9 @@ static int bcm_suspend(struct device *de /* Suspend the device */ if (bdev->device_wakeup) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) gpiod_set_value(bdev->device_wakeup, false); +#endif - BT_DBG("suspend, delaying 15 ms"); + bt_dev_dbg(bdev, "suspend, delaying 15 ms"); mdelay(15); } -@@ -363,7 +369,9 @@ static int bcm_resume(struct device *dev - BT_DBG("resume (%p): is_suspended %d", bdev, bdev->is_suspended); +@@ -376,7 +382,9 @@ static int bcm_resume(struct device *dev + goto unlock; if (bdev->device_wakeup) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) gpiod_set_value(bdev->device_wakeup, true); +#endif - BT_DBG("resume, delaying 15 ms"); + bt_dev_dbg(bdev, "resume, delaying 15 ms"); mdelay(15); } -@@ -379,6 +387,7 @@ static int bcm_resume(struct device *dev +@@ -395,6 +403,7 @@ unlock: } #endif @@ -49,7 +49,7 @@ static const struct acpi_gpio_params device_wakeup_gpios = { 0, 0, false }; static const struct acpi_gpio_params shutdown_gpios = { 1, 0, false }; -@@ -388,7 +397,6 @@ static const struct acpi_gpio_mapping ac +@@ -404,7 +413,6 @@ static const struct acpi_gpio_mapping ac { }, }; @@ -57,7 +57,7 @@ static int bcm_resource(struct acpi_resource *ares, void *data) { struct bcm_device *dev = data; -@@ -527,7 +535,7 @@ static const struct hci_uart_proto bcm_p +@@ -543,7 +551,7 @@ static const struct hci_uart_proto bcm_p .dequeue = bcm_dequeue, }; @@ -66,7 +66,7 @@ static const struct acpi_device_id bcm_acpi_match[] = { { "BCM2E39", 0 }, { "BCM2E67", 0 }, -@@ -544,7 +552,9 @@ static struct platform_driver bcm_driver +@@ -560,7 +568,9 @@ static struct platform_driver bcm_driver .remove = bcm_remove, .driver = { .name = "hci_bcm", |