diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-15 17:44:11 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-15 19:25:38 +0100 |
commit | 2ba8fbc5d4f33ef6cf5c332667d4541471c51015 (patch) | |
tree | e98144aabb5cdc91c97200061dfc3e4441087bf2 /patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_intel.patch | |
parent | bb5fef86aced5dd74c0cdca0ca3d820cc180b94a (diff) |
patches: refresh on v4.3v4.3-1linux-4.3.y
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 ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_intel.patch')
-rw-r--r-- | patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_intel.patch | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_intel.patch b/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_intel.patch index a6a7d0f4..505d1025 100644 --- a/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_intel.patch +++ b/patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_intel.patch @@ -8,19 +8,19 @@ #include <linux/gpio/consumer.h> +#endif #include <linux/acpi.h> - #include <linux/interrupt.h> - #include <linux/pm_runtime.h> -@@ -374,7 +376,9 @@ static int intel_set_power(struct hci_ua + + #include <net/bluetooth/bluetooth.h> +@@ -166,7 +168,9 @@ static int intel_set_power(struct hci_ua BT_INFO("hu %p, Switching compatible pm device (%s) to %u", hu, dev_name(&idev->pdev->dev), powered); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) gpiod_set_value(idev->reset, powered); +#endif + } - /* Provide to idev a hu reference which is used to run LPM - * transactions (lpm suspend/resume) from PM callbacks. -@@ -1322,14 +1326,17 @@ static int intel_probe(struct platform_d + spin_unlock(&intel_device_list_lock); +@@ -895,12 +899,14 @@ static int intel_probe(struct platform_d return -ENODEV; } @@ -33,35 +33,5 @@ } +#endif - idev->irq = platform_get_irq(pdev, 0); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) - if (idev->irq < 0) { - struct gpio_desc *host_wake; - -@@ -1348,12 +1355,15 @@ static int intel_probe(struct platform_d - goto no_irq; - } - } -+#endif - - /* Only enable wake-up/irq when controller is powered */ - device_set_wakeup_capable(&pdev->dev, true); - device_wakeup_disable(&pdev->dev); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) - no_irq: -+#endif platform_set_drvdata(pdev, idev); - /* Place this instance on the device list */ -@@ -1361,8 +1371,10 @@ no_irq: - list_add_tail(&idev->list, &intel_device_list); - mutex_unlock(&intel_device_list_lock); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) - dev_info(&pdev->dev, "registered, gpio(%d)/irq(%d).\n", - desc_to_gpio(idev->reset), idev->irq); -+#endif - - return 0; - } |