Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 367cbaa

Browse files
committed
Merge tag 'devicetree-fixes-for-6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fix from Rob Herring: - One fix for PASemi Nemo board interrupts * tag 'devicetree-fixes-for-6.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: of/irq: Disable "interrupt-map" parsing for PASEMI Nemo
2 parents 34afb82 + 2cf6b7d commit 367cbaa

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

drivers/of/irq.c

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ EXPORT_SYMBOL_GPL(of_irq_find_parent);
8181
/*
8282
* These interrupt controllers abuse interrupt-map for unspeakable
8383
* reasons and rely on the core code to *ignore* it (the drivers do
84-
* their own parsing of the property).
84+
* their own parsing of the property). The PAsemi entry covers a
85+
* non-sensical interrupt-map that is better left ignored.
8586
*
8687
* If you think of adding to the list for something *new*, think
8788
* again. There is a high chance that you will be sent back to the
@@ -95,6 +96,7 @@ static const char * const of_irq_imap_abusers[] = {
9596
"fsl,ls1043a-extirq",
9697
"fsl,ls1088a-extirq",
9798
"renesas,rza1-irqc",
99+
"pasemi,rootbus",
98100
NULL,
99101
};
100102

@@ -293,20 +295,8 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
293295
imaplen -= imap - oldimap;
294296
pr_debug(" -> imaplen=%d\n", imaplen);
295297
}
296-
if (!match) {
297-
if (intc) {
298-
/*
299-
* The PASEMI Nemo is a known offender, so
300-
* let's only warn for anyone else.
301-
*/
302-
WARN(!IS_ENABLED(CONFIG_PPC_PASEMI),
303-
"%pOF interrupt-map failed, using interrupt-controller\n",
304-
ipar);
305-
return 0;
306-
}
307-
298+
if (!match)
308299
goto fail;
309-
}
310300

311301
/*
312302
* Successfully parsed an interrupt-map translation; copy new

0 commit comments

Comments
 (0)