From: Greg Kroah-Hartman Date: Fri, 12 Mar 2021 13:23:35 +0000 (+0100) Subject: drop queue-5.4/gpiolib-acpi-allow-to-find-gpioint-resource-by-name-and-index.patch X-Git-Tag: v4.4.262~93 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f91c97a7dc5a4cf7e82567f3bedfd3658167237;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.4/gpiolib-acpi-allow-to-find-gpioint-resource-by-name-and-index.patch --- diff --git a/queue-5.4/gpiolib-acpi-allow-to-find-gpioint-resource-by-name-and-index.patch b/queue-5.4/gpiolib-acpi-allow-to-find-gpioint-resource-by-name-and-index.patch deleted file mode 100644 index 82d92e04a67..00000000000 --- a/queue-5.4/gpiolib-acpi-allow-to-find-gpioint-resource-by-name-and-index.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 809390219fb9c2421239afe5c9eb862d73978ba0 Mon Sep 17 00:00:00 2001 -From: Andy Shevchenko -Date: Thu, 25 Feb 2021 18:33:19 +0200 -Subject: gpiolib: acpi: Allow to find GpioInt() resource by name and index - -From: Andy Shevchenko - -commit 809390219fb9c2421239afe5c9eb862d73978ba0 upstream. - -Currently only search by index is supported. However, in some cases -we might need to pass the quirks to the acpi_dev_gpio_irq_get(). - -For this, split out acpi_dev_gpio_irq_get_by() and replace -acpi_dev_gpio_irq_get() by calling above with NULL for name parameter. - -Fixes: ba8c90c61847 ("gpio: pca953x: Override IRQ for one of the expanders on Galileo Gen 2") -Depends-on: 0ea683931adb ("gpio: dwapb: Convert driver to using the GPIO-lib-based IRQ-chip") -Signed-off-by: Andy Shevchenko -Acked-by: Mika Westerberg -Acked-by: Linus Walleij -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpio/gpiolib-acpi.c | 12 ++++++++---- - include/linux/acpi.h | 10 ++++++++-- - 2 files changed, 16 insertions(+), 6 deletions(-) - ---- a/drivers/gpio/gpiolib-acpi.c -+++ b/drivers/gpio/gpiolib-acpi.c -@@ -904,8 +904,9 @@ struct gpio_desc *acpi_node_get_gpiod(st - } - - /** -- * acpi_dev_gpio_irq_get() - Find GpioInt and translate it to Linux IRQ number -+ * acpi_dev_gpio_irq_get_by() - Find GpioInt and translate it to Linux IRQ number - * @adev: pointer to a ACPI device to get IRQ from -+ * @name: optional name of GpioInt resource - * @index: index of GpioInt resource (starting from %0) - * - * If the device has one or more GpioInt resources, this function can be -@@ -915,9 +916,12 @@ struct gpio_desc *acpi_node_get_gpiod(st - * The function is idempotent, though each time it runs it will configure GPIO - * pin direction according to the flags in GpioInt resource. - * -+ * The function takes optional @name parameter. If the resource has a property -+ * name, then only those will be taken into account. -+ * - * Return: Linux IRQ number (> %0) on success, negative errno on failure. - */ --int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index) -+int acpi_dev_gpio_irq_get_by(struct acpi_device *adev, const char *name, int index) - { - int idx, i; - unsigned int irq_flags; -@@ -927,7 +931,7 @@ int acpi_dev_gpio_irq_get(struct acpi_de - struct acpi_gpio_info info; - struct gpio_desc *desc; - -- desc = acpi_get_gpiod_by_index(adev, NULL, i, &info); -+ desc = acpi_get_gpiod_by_index(adev, name, i, &info); - - /* Ignore -EPROBE_DEFER, it only matters if idx matches */ - if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER) -@@ -964,7 +968,7 @@ int acpi_dev_gpio_irq_get(struct acpi_de - } - return -ENOENT; - } --EXPORT_SYMBOL_GPL(acpi_dev_gpio_irq_get); -+EXPORT_SYMBOL_GPL(acpi_dev_gpio_irq_get_by); - - static acpi_status - acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address, ---- a/include/linux/acpi.h -+++ b/include/linux/acpi.h -@@ -1019,19 +1019,25 @@ void __acpi_handle_debug(struct _ddebug - #if defined(CONFIG_ACPI) && defined(CONFIG_GPIOLIB) - bool acpi_gpio_get_irq_resource(struct acpi_resource *ares, - struct acpi_resource_gpio **agpio); --int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index); -+int acpi_dev_gpio_irq_get_by(struct acpi_device *adev, const char *name, int index); - #else - static inline bool acpi_gpio_get_irq_resource(struct acpi_resource *ares, - struct acpi_resource_gpio **agpio) - { - return false; - } --static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index) -+static inline int acpi_dev_gpio_irq_get_by(struct acpi_device *adev, -+ const char *name, int index) - { - return -ENXIO; - } - #endif - -+static inline int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index) -+{ -+ return acpi_dev_gpio_irq_get_by(adev, NULL, index); -+} -+ - /* Device properties */ - - #ifdef CONFIG_ACPI diff --git a/queue-5.4/series b/queue-5.4/series index 272d6712145..491437c7d1e 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -5,7 +5,6 @@ ath9k-fix-transmitting-to-stations-in-dynamic-smps-mode.patch net-fix-gro-aggregation-for-udp-encaps-with-zero-csum.patch net-check-if-protocol-extracted-by-virtio_net_hdr_set_proto-is-correct.patch net-avoid-infinite-loop-in-mpls_gso_segment-when-mpls_hlen-0.patch -gpiolib-acpi-allow-to-find-gpioint-resource-by-name-and-index.patch sh_eth-fix-trscer-mask-for-sh771x.patch can-skb-can_skb_set_owner-fix-ref-counting-if-socket-was-closed-before-setting-skb-ownership.patch can-flexcan-assert-frz-bit-in-flexcan_chip_freeze.patch