dropped gpio-ixp4xx-make-irqchip-immutable.patch

from 5.10, 5.15, and 5.4

diff --git a/queue-5.10/gpio-ixp4xx-make-irqchip-immutable.patch b/queue-5.10/gpio-ixp4xx-make-irqchip-immutable.patch
deleted file mode 100644 (file)
index 32bc822..0000000
--- a/queue-5.10/gpio-ixp4xx-make-irqchip-immutable.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 7861e366b3c3b67a6fae5273f8994f5986eabe1b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 11 Sep 2022 21:07:51 +0200
-Subject: gpio: ixp4xx: Make irqchip immutable
-
-From: Linus Walleij <linus.walleij@linaro.org>
-
-[ Upstream commit 94e9bc73d85aa6ecfe249e985ff57abe0ab35f34 ]
-
-This turns the IXP4xx GPIO irqchip into an immutable
-irqchip, a bit different from the standard template due
-to being hierarchical.
-
-Tested on the IXP4xx which uses drivers/ata/pata_ixp4xx_cf.c
-for a rootfs on compact flash with IRQs from this GPIO
-block to the CF ATA controller.
-
-Cc: Marc Zyngier <maz@kernel.org>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Acked-by: Marc Zyngier <maz@kernel.org>
-Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpio/gpio-ixp4xx.c | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpio/gpio-ixp4xx.c b/drivers/gpio/gpio-ixp4xx.c
-index b3b050604e0b..6bd047e2ca46 100644
---- a/drivers/gpio/gpio-ixp4xx.c
-+++ b/drivers/gpio/gpio-ixp4xx.c
-@@ -67,6 +67,14 @@ static void ixp4xx_gpio_irq_ack(struct irq_data *d)
-       __raw_writel(BIT(d->hwirq), g->base + IXP4XX_REG_GPIS);
- }
- 
-+static void ixp4xx_gpio_mask_irq(struct irq_data *d)
-+{
-+      struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-+
-+      irq_chip_mask_parent(d);
-+      gpiochip_disable_irq(gc, d->hwirq);
-+}
-+
- static void ixp4xx_gpio_irq_unmask(struct irq_data *d)
- {
-       struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-@@ -76,6 +84,7 @@ static void ixp4xx_gpio_irq_unmask(struct irq_data *d)
-       if (!(g->irq_edge & BIT(d->hwirq)))
-               ixp4xx_gpio_irq_ack(d);
- 
-+      gpiochip_enable_irq(gc, d->hwirq);
-       irq_chip_unmask_parent(d);
- }
- 
-@@ -153,12 +162,14 @@ static int ixp4xx_gpio_irq_set_type(struct irq_data *d, unsigned int type)
-       return irq_chip_set_type_parent(d, IRQ_TYPE_LEVEL_HIGH);
- }
- 
--static struct irq_chip ixp4xx_gpio_irqchip = {
-+static const struct irq_chip ixp4xx_gpio_irqchip = {
-       .name = "IXP4GPIO",
-       .irq_ack = ixp4xx_gpio_irq_ack,
--      .irq_mask = irq_chip_mask_parent,
-+      .irq_mask = ixp4xx_gpio_mask_irq,
-       .irq_unmask = ixp4xx_gpio_irq_unmask,
-       .irq_set_type = ixp4xx_gpio_irq_set_type,
-+      .flags = IRQCHIP_IMMUTABLE,
-+      GPIOCHIP_IRQ_RESOURCE_HELPERS,
- };
- 
- static int ixp4xx_gpio_child_to_parent_hwirq(struct gpio_chip *gc,
-@@ -282,7 +293,7 @@ static int ixp4xx_gpio_probe(struct platform_device *pdev)
-       g->gc.owner = THIS_MODULE;
- 
-       girq = &g->gc.irq;
--      girq->chip = &ixp4xx_gpio_irqchip;
-+      gpio_irq_chip_set_chip(girq, &ixp4xx_gpio_irqchip);
-       girq->fwnode = g->fwnode;
-       girq->parent_domain = parent;
-       girq->child_to_parent_hwirq = ixp4xx_gpio_child_to_parent_hwirq;
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 3ca540f0d0b0d1097f44c68c8e2e3a46a57f4391..d3d7f554ce927e0f395ae7792bc321a42c1a9208 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -125,7 +125,6 @@ cifs-use-discard-iterator-to-discard-unneeded-networ.patch
 cifs-always-initialize-struct-msghdr-smb_msg-complet.patch
 drivers-hv-never-allocate-anything-besides-framebuff.patch
 drm-gma500-fix-bug-sleeping-function-called-from-inv.patch
-gpio-ixp4xx-make-irqchip-immutable.patch
 drm-amdgpu-use-dirty-framebuffer-helper.patch
 drm-amd-display-limit-user-regamma-to-a-valid-value.patch
 drm-amd-display-mark-dml30-s-useminimumdcfclk-as-noi.patch

diff --git a/queue-5.15/gpio-ixp4xx-make-irqchip-immutable.patch b/queue-5.15/gpio-ixp4xx-make-irqchip-immutable.patch
deleted file mode 100644 (file)
index bb3ef4c..0000000
--- a/queue-5.15/gpio-ixp4xx-make-irqchip-immutable.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 1c91da22aa44c7fc0b4af49bdd76f55ee959b3d3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 11 Sep 2022 21:07:51 +0200
-Subject: gpio: ixp4xx: Make irqchip immutable
-
-From: Linus Walleij <linus.walleij@linaro.org>
-
-[ Upstream commit 94e9bc73d85aa6ecfe249e985ff57abe0ab35f34 ]
-
-This turns the IXP4xx GPIO irqchip into an immutable
-irqchip, a bit different from the standard template due
-to being hierarchical.
-
-Tested on the IXP4xx which uses drivers/ata/pata_ixp4xx_cf.c
-for a rootfs on compact flash with IRQs from this GPIO
-block to the CF ATA controller.
-
-Cc: Marc Zyngier <maz@kernel.org>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Acked-by: Marc Zyngier <maz@kernel.org>
-Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpio/gpio-ixp4xx.c | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpio/gpio-ixp4xx.c b/drivers/gpio/gpio-ixp4xx.c
-index b3b050604e0b..6bd047e2ca46 100644
---- a/drivers/gpio/gpio-ixp4xx.c
-+++ b/drivers/gpio/gpio-ixp4xx.c
-@@ -67,6 +67,14 @@ static void ixp4xx_gpio_irq_ack(struct irq_data *d)
-       __raw_writel(BIT(d->hwirq), g->base + IXP4XX_REG_GPIS);
- }
- 
-+static void ixp4xx_gpio_mask_irq(struct irq_data *d)
-+{
-+      struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-+
-+      irq_chip_mask_parent(d);
-+      gpiochip_disable_irq(gc, d->hwirq);
-+}
-+
- static void ixp4xx_gpio_irq_unmask(struct irq_data *d)
- {
-       struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-@@ -76,6 +84,7 @@ static void ixp4xx_gpio_irq_unmask(struct irq_data *d)
-       if (!(g->irq_edge & BIT(d->hwirq)))
-               ixp4xx_gpio_irq_ack(d);
- 
-+      gpiochip_enable_irq(gc, d->hwirq);
-       irq_chip_unmask_parent(d);
- }
- 
-@@ -153,12 +162,14 @@ static int ixp4xx_gpio_irq_set_type(struct irq_data *d, unsigned int type)
-       return irq_chip_set_type_parent(d, IRQ_TYPE_LEVEL_HIGH);
- }
- 
--static struct irq_chip ixp4xx_gpio_irqchip = {
-+static const struct irq_chip ixp4xx_gpio_irqchip = {
-       .name = "IXP4GPIO",
-       .irq_ack = ixp4xx_gpio_irq_ack,
--      .irq_mask = irq_chip_mask_parent,
-+      .irq_mask = ixp4xx_gpio_mask_irq,
-       .irq_unmask = ixp4xx_gpio_irq_unmask,
-       .irq_set_type = ixp4xx_gpio_irq_set_type,
-+      .flags = IRQCHIP_IMMUTABLE,
-+      GPIOCHIP_IRQ_RESOURCE_HELPERS,
- };
- 
- static int ixp4xx_gpio_child_to_parent_hwirq(struct gpio_chip *gc,
-@@ -282,7 +293,7 @@ static int ixp4xx_gpio_probe(struct platform_device *pdev)
-       g->gc.owner = THIS_MODULE;
- 
-       girq = &g->gc.irq;
--      girq->chip = &ixp4xx_gpio_irqchip;
-+      gpio_irq_chip_set_chip(girq, &ixp4xx_gpio_irqchip);
-       girq->fwnode = g->fwnode;
-       girq->parent_domain = parent;
-       girq->child_to_parent_hwirq = ixp4xx_gpio_child_to_parent_hwirq;
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 7961664c4845a190d56b54cf14e4f8539d61a714..ad9a6179f512417913ea3779f65bb5131322a0b6 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -123,7 +123,6 @@ s390-dasd-fix-oops-in-dasd_alias_get_start_dev-due-to-missing-pavgroup.patch
 drm-amd-amdgpu-fixing-read-wrong-pf2vf-data-in-sriov.patch
 drivers-hv-never-allocate-anything-besides-framebuff.patch
 drm-gma500-fix-bug-sleeping-function-called-from-inv.patch
-gpio-ixp4xx-make-irqchip-immutable.patch
 drm-amd-pm-disable-baco-entry-exit-completely-on-sev.patch
 drm-amdgpu-use-dirty-framebuffer-helper.patch
 drm-amd-display-limit-user-regamma-to-a-valid-value.patch

diff --git a/queue-5.4/gpio-ixp4xx-make-irqchip-immutable.patch b/queue-5.4/gpio-ixp4xx-make-irqchip-immutable.patch
deleted file mode 100644 (file)
index 902050c..0000000
--- a/queue-5.4/gpio-ixp4xx-make-irqchip-immutable.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From f9317d5b6cafbe51db6c781647f15326fa17f2fa Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 11 Sep 2022 21:07:51 +0200
-Subject: gpio: ixp4xx: Make irqchip immutable
-
-From: Linus Walleij <linus.walleij@linaro.org>
-
-[ Upstream commit 94e9bc73d85aa6ecfe249e985ff57abe0ab35f34 ]
-
-This turns the IXP4xx GPIO irqchip into an immutable
-irqchip, a bit different from the standard template due
-to being hierarchical.
-
-Tested on the IXP4xx which uses drivers/ata/pata_ixp4xx_cf.c
-for a rootfs on compact flash with IRQs from this GPIO
-block to the CF ATA controller.
-
-Cc: Marc Zyngier <maz@kernel.org>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-Acked-by: Marc Zyngier <maz@kernel.org>
-Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpio/gpio-ixp4xx.c | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpio/gpio-ixp4xx.c b/drivers/gpio/gpio-ixp4xx.c
-index b3b050604e0b..6bd047e2ca46 100644
---- a/drivers/gpio/gpio-ixp4xx.c
-+++ b/drivers/gpio/gpio-ixp4xx.c
-@@ -67,6 +67,14 @@ static void ixp4xx_gpio_irq_ack(struct irq_data *d)
-       __raw_writel(BIT(d->hwirq), g->base + IXP4XX_REG_GPIS);
- }
- 
-+static void ixp4xx_gpio_mask_irq(struct irq_data *d)
-+{
-+      struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-+
-+      irq_chip_mask_parent(d);
-+      gpiochip_disable_irq(gc, d->hwirq);
-+}
-+
- static void ixp4xx_gpio_irq_unmask(struct irq_data *d)
- {
-       struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-@@ -76,6 +84,7 @@ static void ixp4xx_gpio_irq_unmask(struct irq_data *d)
-       if (!(g->irq_edge & BIT(d->hwirq)))
-               ixp4xx_gpio_irq_ack(d);
- 
-+      gpiochip_enable_irq(gc, d->hwirq);
-       irq_chip_unmask_parent(d);
- }
- 
-@@ -153,12 +162,14 @@ static int ixp4xx_gpio_irq_set_type(struct irq_data *d, unsigned int type)
-       return irq_chip_set_type_parent(d, IRQ_TYPE_LEVEL_HIGH);
- }
- 
--static struct irq_chip ixp4xx_gpio_irqchip = {
-+static const struct irq_chip ixp4xx_gpio_irqchip = {
-       .name = "IXP4GPIO",
-       .irq_ack = ixp4xx_gpio_irq_ack,
--      .irq_mask = irq_chip_mask_parent,
-+      .irq_mask = ixp4xx_gpio_mask_irq,
-       .irq_unmask = ixp4xx_gpio_irq_unmask,
-       .irq_set_type = ixp4xx_gpio_irq_set_type,
-+      .flags = IRQCHIP_IMMUTABLE,
-+      GPIOCHIP_IRQ_RESOURCE_HELPERS,
- };
- 
- static int ixp4xx_gpio_child_to_parent_hwirq(struct gpio_chip *gc,
-@@ -282,7 +293,7 @@ static int ixp4xx_gpio_probe(struct platform_device *pdev)
-       g->gc.owner = THIS_MODULE;
- 
-       girq = &g->gc.irq;
--      girq->chip = &ixp4xx_gpio_irqchip;
-+      gpio_irq_chip_set_chip(girq, &ixp4xx_gpio_irqchip);
-       girq->fwnode = g->fwnode;
-       girq->parent_domain = parent;
-       girq->child_to_parent_hwirq = ixp4xx_gpio_child_to_parent_hwirq;
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index ce1ebfd94c831c64dbeae7586cc45fbd436d6fd4..96fa823d003b23ac15e3879e77baa1c843faecab 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -92,7 +92,6 @@ s390-dasd-fix-oops-in-dasd_alias_get_start_dev-due-to-missing-pavgroup.patch
 usb-xhci-mtk-fix-issue-of-out-of-bounds-array-access.patch
 cifs-always-initialize-struct-msghdr-smb_msg-complet.patch
 drivers-hv-never-allocate-anything-besides-framebuff.patch
-gpio-ixp4xx-make-irqchip-immutable.patch
 drm-amdgpu-use-dirty-framebuffer-helper.patch
 drm-amd-display-limit-user-regamma-to-a-valid-value.patch
 drm-rockchip-fix-return-type-of-cdn_dp_connector_mod.patch