[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20191223131702.32857-1-paul@crapouillou.net>
Date: Mon, 23 Dec 2019 14:17:02 +0100
From: Paul Cercueil <paul@...pouillou.net>
To: Thomas Gleixner <tglx@...utronix.de>,
Jason Cooper <jason@...edaemon.net>,
Marc Zyngier <maz@...nel.org>
Cc: od@...c.me, linux-kernel@...r.kernel.org,
Paul Cercueil <paul@...pouillou.net>,
"H . Nikolaus Schaller" <hns@...delico.com>,
周琰杰 <zhouyanjie@...yeetech.com>
Subject: [PATCH] irqchip: ingenic: Get rid of the legacy IRQ domain
Get rid of the legacy IRQ domain and hardcoded IRQ base, since all the
Ingenic drivers and platform code have been updated to use devicetree.
Fixes: 8bc7464b5140 ("irqchip: ingenic: Alloc generic chips from IRQ
domain").
Signed-off-by: Paul Cercueil <paul@...pouillou.net>
Tested-by: H. Nikolaus Schaller <hns@...delico.com>
Tested-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@...yeetech.com>
---
drivers/irqchip/irq-ingenic.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/irqchip/irq-ingenic.c b/drivers/irqchip/irq-ingenic.c
index 01d18b39069e..c5589ee0dfb3 100644
--- a/drivers/irqchip/irq-ingenic.c
+++ b/drivers/irqchip/irq-ingenic.c
@@ -17,7 +17,6 @@
#include <linux/delay.h>
#include <asm/io.h>
-#include <asm/mach-jz4740/irq.h>
struct ingenic_intc_data {
void __iomem *base;
@@ -50,7 +49,7 @@ static irqreturn_t intc_cascade(int irq, void *data)
while (pending) {
int bit = __fls(pending);
- irq = irq_find_mapping(domain, bit + (i * 32));
+ irq = irq_linear_revmap(domain, bit + (i * 32));
generic_handle_irq(irq);
pending &= ~BIT(bit);
}
@@ -97,8 +96,7 @@ static int __init ingenic_intc_of_init(struct device_node *node,
goto out_unmap_irq;
}
- domain = irq_domain_add_legacy(node, num_chips * 32,
- JZ4740_IRQ_BASE, 0,
+ domain = irq_domain_add_linear(node, num_chips * 32,
&irq_generic_chip_ops, NULL);
if (!domain) {
err = -ENOMEM;
--
2.24.0
Powered by blists - more mailing lists