The following commit has been merged into the irq/drivers branch of tip:
Commit-ID: 54a1f3eb89ded8114b0bffc3696757cd95665ef9
Gitweb: https://git.kernel.org/tip/54a1f3eb89ded8114b0bffc3696757cd95665ef9
Author: Alexey Charkov <alchark@gmail.com>
AuthorDate: Tue, 06 May 2025 16:46:16 +04:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 06 May 2025 15:58:26 +02:00
irqchip/irq-vt8500: Don't require 8 interrupts from a chained controller
VT8500 chained controller can route its interrupts to either or all
of its 8 interrupt outputs. Current code actually routes all of them
to the first output, so there is no need to create mappings for all
eight.
Drop redundant checks, and only map as many chained controller
interrupts as are defined in the device tree.
Signed-off-by: Alexey Charkov <alchark@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250506-vt8500-intc-updates-v2-3-a3a0606cf92d@gmail.com
---
drivers/irqchip/irq-vt8500.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/irqchip/irq-vt8500.c b/drivers/irqchip/irq-vt8500.c
index c88aa64..debca89 100644
--- a/drivers/irqchip/irq-vt8500.c
+++ b/drivers/irqchip/irq-vt8500.c
@@ -220,16 +220,9 @@ static int __init vt8500_irq_init(struct device_node *node,
active_cnt++;
- /* check if this is a slaved controller */
+ /* check if this is a chained controller */
if (of_irq_count(node) != 0) {
- /* check that we have the correct number of interrupts */
- if (of_irq_count(node) != 8) {
- pr_err("%s: Incorrect IRQ map for slaved controller\n",
- __func__);
- return -EINVAL;
- }
-
- for (i = 0; i < 8; i++) {
+ for (i = 0; i < of_irq_count(node); i++) {
irq = irq_of_parse_and_map(node, i);
enable_irq(irq);
}