Commit 66865de4314caca30598244b86817e774c188afa
Committed by
Rob Herring
1 parent
27b3383a14
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
of/irq: Drop obsolete 'interrupts' vs 'interrupts-extended' text
a9ecdc0fdc54 ("of/irq: Fix lookup to use 'interrupts-extended' property first") updated the description to say that: - Both 'interrupts' and 'interrupts-extended' may be present - Software should prefer 'interrupts-extended' - Software that doesn't comprehend 'interrupts-extended' may use 'interrupts' But there is still a paragraph at the end that prohibits having both and says 'interrupts' should be preferred. Remove the contradictory text. Fixes: a9ecdc0fdc54 ("of/irq: Fix lookup to use 'interrupts-extended' property first") Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: stable@vger.kernel.org # v3.13+ Acked-by: Brian Norris <computersforpeace@gmail.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Rob Herring <robh@kernel.org>
Showing 1 changed file with 0 additions and 4 deletions Side-by-side Diff
Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
... | ... | @@ -30,10 +30,6 @@ |
30 | 30 | Example: |
31 | 31 | interrupts-extended = <&intc1 5 1>, <&intc2 1 0>; |
32 | 32 | |
33 | -A device node may contain either "interrupts" or "interrupts-extended", but not | |
34 | -both. If both properties are present, then the operating system should log an | |
35 | -error and use only the data in "interrupts". | |
36 | - | |
37 | 33 | 2) Interrupt controller nodes |
38 | 34 | ----------------------------- |
39 | 35 |