Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751343AbaKCKPi (ORCPT ); Mon, 3 Nov 2014 05:15:38 -0500 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:44316 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750991AbaKCKPg (ORCPT ); Mon, 3 Nov 2014 05:15:36 -0500 Date: Mon, 3 Nov 2014 10:15:16 +0000 From: Mark Rutland To: Bjorn Helgaas Cc: "grant.likely@linaro.org" , Rob Herring , "devicetree@vger.kernel.org" , Brian Norris , Florian Fainelli , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] of/irq: Drop obsolete 'interrupts' vs 'interrupts-extended' text Message-ID: <20141103101516.GA29621@leverpostej> References: <20141101233531.4958.96713.stgit@bhelgaas-glaptop2.roam.corp.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20141101233531.4958.96713.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Nov 01, 2014 at 11:35:31PM +0000, Bjorn Helgaas wrote: > 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 > CC: stable@vger.kernel.org # v3.13+ > --- > .../bindings/interrupt-controller/interrupts.txt | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt b/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt > index ce6a1a072028..8a3c40829899 100644 > --- a/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt > +++ b/Documentation/devicetree/bindings/interrupt-controller/interrupts.txt > @@ -30,10 +30,6 @@ should only be used when a device has multiple interrupt parents. > Example: > interrupts-extended = <&intc1 5 1>, <&intc2 1 0>; > > -A device node may contain either "interrupts" or "interrupts-extended", but not > -both. If both properties are present, then the operating system should log an > -error and use only the data in "interrupts". Why not update the binding to explain that interrupts-extended is typically preferred? Mark. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/