diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-05 21:42:34 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-07 17:44:17 +0100 |
commit | 7d07501a8b71a63644693133b94a46dc72bf113b (patch) | |
tree | 2a419e3bbe8189d6666dee9635b4db2c33e4a880 /patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch | |
parent | 258c9f45411bd468953e16e60cc4c1821f322320 (diff) |
patches: refresh on next-20151013backports-20151013
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.72 [ OK ]
4 3.3.8 [ OK ]
5 3.4.110 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.92 [ OK ]
12 3.11.10 [ OK ]
13 3.12.49 [ OK ]
14 3.13.11 [ OK ]
15 3.14.56 [ OK ]
16 3.15.10 [ OK ]
17 3.16.7 [ OK ]
18 3.17.8 [ OK ]
19 3.18.23 [ OK ]
20 3.19.8 [ OK ]
21 4.0.9 [ OK ]
22 4.1.12 [ OK ]
23 4.2.5 [ OK ]
24 4.3-rc7 [ OK ]
manual changes done to the following patches:
* patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch
* patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch
* patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 | 24 |
1 files changed, 12 insertions, 12 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 9e77bb0d..1738b9f5 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 @@ -9,8 +9,8 @@ +#endif #include <linux/tty.h> #include <linux/interrupt.h> - -@@ -141,8 +143,10 @@ static int bcm_gpio_set_power(struct bcm + #include <linux/dmi.h> +@@ -148,8 +150,10 @@ static int bcm_gpio_set_power(struct bcm if (powered && !IS_ERR(dev->clk) && !dev->clk_enabled) clk_enable(dev->clk); @@ -21,7 +21,7 @@ if (!powered && !IS_ERR(dev->clk) && dev->clk_enabled) clk_disable(dev->clk); -@@ -447,7 +451,9 @@ static int bcm_suspend(struct device *de +@@ -520,7 +524,9 @@ static int bcm_suspend_device(struct dev /* Suspend the device */ if (bdev->device_wakeup) { @@ -31,8 +31,8 @@ bt_dev_dbg(bdev, "suspend, delaying 15 ms"); mdelay(15); } -@@ -482,7 +488,9 @@ static int bcm_resume(struct device *dev - } +@@ -535,7 +541,9 @@ static int bcm_resume_device(struct devi + bt_dev_dbg(bdev, ""); if (bdev->device_wakeup) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) @@ -41,7 +41,7 @@ bt_dev_dbg(bdev, "resume, delaying 15 ms"); mdelay(15); } -@@ -501,6 +509,7 @@ unlock: +@@ -618,6 +626,7 @@ unlock: } #endif @@ -49,15 +49,15 @@ static const struct acpi_gpio_params device_wakeup_gpios = { 0, 0, false }; static const struct acpi_gpio_params shutdown_gpios = { 1, 0, false }; static const struct acpi_gpio_params host_wakeup_gpios = { 2, 0, false }; -@@ -512,7 +521,6 @@ static const struct acpi_gpio_mapping ac +@@ -629,7 +638,6 @@ static const struct acpi_gpio_mapping ac { }, }; -#ifdef CONFIG_ACPI - static int bcm_resource(struct acpi_resource *ares, void *data) - { - struct bcm_device *dev = data; -@@ -683,7 +691,7 @@ static const struct hci_uart_proto bcm_p + static u8 acpi_active_low = ACPI_ACTIVE_LOW; + + /* IRQ polarity of some chipsets are not defined correctly in ACPI table. */ +@@ -811,7 +819,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 }, -@@ -700,7 +708,9 @@ static struct platform_driver bcm_driver +@@ -831,7 +839,9 @@ static struct platform_driver bcm_driver .remove = bcm_remove, .driver = { .name = "hci_bcm", |