diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-09-17 23:31:36 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2018-09-19 11:04:33 +0200 |
commit | ab3fd3b9a801a9faa2619e2e65207e736f859a6d (patch) | |
tree | f0a6425fe00ba440e966570e662e6ff9c738d230 /patches/0062-acpi-gpio-remove | |
parent | 30a378636e473278ff65800b1fe58822e36d716c (diff) |
backports: Remove unused parts
This removes parts which were only used by subsystems which are not
included in backports any more, for example media, bluetooth and
Ethernet.
The patches which are removed in this commit are not applied to the
kernel tree anyway with the default configuration because non of the
files get copied. The freezer, media, regulator and sound parts were
only used by the already removed media drivers. The flow dissector file
is not copied any more.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0062-acpi-gpio-remove')
-rw-r--r-- | patches/0062-acpi-gpio-remove/hci_bcm.patch | 78 | ||||
-rw-r--r-- | patches/0062-acpi-gpio-remove/hci_intel.patch | 67 |
2 files changed, 0 insertions, 145 deletions
diff --git a/patches/0062-acpi-gpio-remove/hci_bcm.patch b/patches/0062-acpi-gpio-remove/hci_bcm.patch deleted file mode 100644 index 77e343ee..00000000 --- a/patches/0062-acpi-gpio-remove/hci_bcm.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- a/drivers/bluetooth/hci_bcm.c -+++ b/drivers/bluetooth/hci_bcm.c -@@ -29,7 +29,9 @@ - #include <linux/acpi.h> - #include <linux/platform_device.h> - #include <linux/clk.h> -+#if LINUX_VERSION_IS_GEQ(3,13,0) - #include <linux/gpio/consumer.h> -+#endif - #include <linux/tty.h> - #include <linux/interrupt.h> - #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); - -+#if LINUX_VERSION_IS_GEQ(3,13,0) - gpiod_set_value(dev->shutdown, powered); - gpiod_set_value(dev->device_wakeup, powered); -+#endif - - if (!powered && !IS_ERR(dev->clk) && dev->clk_enabled) - clk_disable(dev->clk); -@@ -520,7 +524,9 @@ static int bcm_suspend_device(struct dev - - /* Suspend the device */ - if (bdev->device_wakeup) { -+#if LINUX_VERSION_IS_GEQ(3,13,0) - gpiod_set_value(bdev->device_wakeup, false); -+#endif - bt_dev_dbg(bdev, "suspend, delaying 15 ms"); - mdelay(15); - } -@@ -535,7 +541,9 @@ static int bcm_resume_device(struct devi - bt_dev_dbg(bdev, ""); - - if (bdev->device_wakeup) { -+#if LINUX_VERSION_IS_GEQ(3,13,0) - gpiod_set_value(bdev->device_wakeup, true); -+#endif - bt_dev_dbg(bdev, "resume, delaying 15 ms"); - mdelay(15); - } -@@ -618,6 +626,7 @@ unlock: - } - #endif - -+#if defined(CONFIG_ACPI) && LINUX_VERSION_IS_GEQ(3,19,0) - 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 }; -@@ -629,7 +638,6 @@ static const struct acpi_gpio_mapping ac - { }, - }; - --#ifdef CONFIG_ACPI - static u8 acpi_active_low = ACPI_ACTIVE_LOW; - - /* IRQ polarity of some chipsets are not defined correctly in ACPI table. */ -@@ -812,7 +820,7 @@ static const struct hci_uart_proto bcm_p - .dequeue = bcm_dequeue, - }; - --#ifdef CONFIG_ACPI -+#if defined(CONFIG_ACPI) && LINUX_VERSION_IS_GEQ(3,19,0) - static const struct acpi_device_id bcm_acpi_match[] = { - { "BCM2E1A", 0 }, - { "BCM2E39", 0 }, -@@ -843,7 +851,9 @@ static struct platform_driver bcm_driver - .remove = bcm_remove, - .driver = { - .name = "hci_bcm", -+#if LINUX_VERSION_IS_GEQ(3,19,0) - .acpi_match_table = ACPI_PTR(bcm_acpi_match), -+#endif - .pm = &bcm_pm_ops, - }, - }; diff --git a/patches/0062-acpi-gpio-remove/hci_intel.patch b/patches/0062-acpi-gpio-remove/hci_intel.patch deleted file mode 100644 index 9237ce97..00000000 --- a/patches/0062-acpi-gpio-remove/hci_intel.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/drivers/bluetooth/hci_intel.c -+++ b/drivers/bluetooth/hci_intel.c -@@ -29,7 +29,9 @@ - #include <linux/wait.h> - #include <linux/tty.h> - #include <linux/platform_device.h> -+#if LINUX_VERSION_IS_GEQ(3,13,0) - #include <linux/gpio/consumer.h> -+#endif - #include <linux/acpi.h> - #include <linux/interrupt.h> - #include <linux/pm_runtime.h> -@@ -379,7 +381,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_IS_GEQ(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. -@@ -1306,14 +1310,17 @@ static int intel_probe(struct platform_d - - idev->pdev = pdev; - -+#if LINUX_VERSION_IS_GEQ(3,17,0) - idev->reset = devm_gpiod_get_optional(&pdev->dev, "reset", - GPIOD_OUT_LOW); - if (IS_ERR(idev->reset)) { - dev_err(&pdev->dev, "Unable to retrieve gpio\n"); - return PTR_ERR(idev->reset); - } -+#endif - - idev->irq = platform_get_irq(pdev, 0); -+#if LINUX_VERSION_IS_GEQ(3,17,0) - if (idev->irq < 0) { - struct gpio_desc *host_wake; - -@@ -1332,12 +1339,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_IS_GEQ(3,17,0) - no_irq: -+#endif - platform_set_drvdata(pdev, idev); - - /* Place this instance on the device list */ -@@ -1345,8 +1355,10 @@ no_irq: - list_add_tail(&idev->list, &intel_device_list); - mutex_unlock(&intel_device_list_lock); - -+#if LINUX_VERSION_IS_GEQ(3,13,0) - dev_info(&pdev->dev, "registered, gpio(%d)/irq(%d).\n", - desc_to_gpio(idev->reset), idev->irq); -+#endif - - return 0; - } |