Commit 367cbaad authored by Linus Torvalds's avatar Linus Torvalds

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
parents 34afb82a 2cf6b7d1
...@@ -81,7 +81,8 @@ EXPORT_SYMBOL_GPL(of_irq_find_parent); ...@@ -81,7 +81,8 @@ EXPORT_SYMBOL_GPL(of_irq_find_parent);
/* /*
* These interrupt controllers abuse interrupt-map for unspeakable * These interrupt controllers abuse interrupt-map for unspeakable
* reasons and rely on the core code to *ignore* it (the drivers do * reasons and rely on the core code to *ignore* it (the drivers do
* their own parsing of the property). * their own parsing of the property). The PAsemi entry covers a
* non-sensical interrupt-map that is better left ignored.
* *
* If you think of adding to the list for something *new*, think * If you think of adding to the list for something *new*, think
* again. There is a high chance that you will be sent back to the * 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[] = { ...@@ -95,6 +96,7 @@ static const char * const of_irq_imap_abusers[] = {
"fsl,ls1043a-extirq", "fsl,ls1043a-extirq",
"fsl,ls1088a-extirq", "fsl,ls1088a-extirq",
"renesas,rza1-irqc", "renesas,rza1-irqc",
"pasemi,rootbus",
NULL, NULL,
}; };
...@@ -293,20 +295,8 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq) ...@@ -293,20 +295,8 @@ int of_irq_parse_raw(const __be32 *addr, struct of_phandle_args *out_irq)
imaplen -= imap - oldimap; imaplen -= imap - oldimap;
pr_debug(" -> imaplen=%d\n", imaplen); pr_debug(" -> imaplen=%d\n", imaplen);
} }
if (!match) { if (!match)
if (intc) {
/*
* The PASEMI Nemo is a known offender, so
* let's only warn for anyone else.
*/
WARN(!IS_ENABLED(CONFIG_PPC_PASEMI),
"%pOF interrupt-map failed, using interrupt-controller\n",
ipar);
return 0;
}
goto fail; goto fail;
}
/* /*
* Successfully parsed an interrupt-map translation; copy new * Successfully parsed an interrupt-map translation; copy new
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment