Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7E42C636D4 for ; Mon, 13 Feb 2023 12:34:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230183AbjBMMeA (ORCPT ); Mon, 13 Feb 2023 07:34:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231209AbjBMMd5 (ORCPT ); Mon, 13 Feb 2023 07:33:57 -0500 Received: from soltyk.jannau.net (soltyk.jannau.net [144.76.91.90]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05351A24C; Mon, 13 Feb 2023 04:33:48 -0800 (PST) Received: by soltyk.jannau.net (Postfix, from userid 1000) id 7763A26F77E; Mon, 13 Feb 2023 13:33:46 +0100 (CET) Date: Mon, 13 Feb 2023 13:33:46 +0100 From: Janne Grunau To: Krzysztof Kozlowski Cc: Hector Martin , Sven Peter , Alyssa Rosenzweig , Rob Herring , Krzysztof Kozlowski , Mark Kettenis , Thomas Gleixner , Marc Zyngier , asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 05/17] dt-bindings: interrupt-controller: apple,aic2: Add apple,t8112-aic compatible Message-ID: <20230213123346.GB17933@jannau.net> References: <20230202-asahi-t8112-dt-v1-0-cb5442d1c229@jannau.net> <20230202-asahi-t8112-dt-v1-5-cb5442d1c229@jannau.net> <2f5a63ba-f4de-da89-7621-3fe1d79cdc94@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2f5a63ba-f4de-da89-7621-3fe1d79cdc94@linaro.org> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2023-02-13 12:12:25 +0100, Krzysztof Kozlowski wrote: > On 12/02/2023 16:41, Janne Grunau wrote: > > The Apple M2 SoC uses AICv2 and is compatible with the existing driver. > > Add its per-SoC compatible. > > Since multi-die versions of the M2 are not expected decrease > > '#interrupt-cells' to 3 for apple,t8112-aic. This is seamlessly handled > > inside the driver. > > > > Signed-off-by: Janne Grunau > > > > --- > > This trivial dt-bindings update should be merged through the asahi-soc > > tree to ensure validation of the Apple M2 (t8112) devicetrees in this > > series. > > --- > > .../bindings/interrupt-controller/apple,aic2.yaml | 23 +++++++++++++++++++--- > > 1 file changed, 20 insertions(+), 3 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/interrupt-controller/apple,aic2.yaml b/Documentation/devicetree/bindings/interrupt-controller/apple,aic2.yaml > > index 06948c0e36a5..120e23ff668c 100644 > > --- a/Documentation/devicetree/bindings/interrupt-controller/apple,aic2.yaml > > +++ b/Documentation/devicetree/bindings/interrupt-controller/apple,aic2.yaml > > @@ -31,19 +31,22 @@ description: | > > properties: > > compatible: > > items: > > - - const: apple,t6000-aic > > + - enum: > > + - apple,t8112-aic > > + - apple,t6000-aic > > - const: apple,aic2 > > > > interrupt-controller: true > > > > '#interrupt-cells': > > - const: 4 > > + minimum: 3 > > + maximum: 4 > > description: | > > The 1st cell contains the interrupt type: > > - 0: Hardware IRQ > > - 1: FIQ > > > > - The 2nd cell contains the die ID. > > + The 2nd cell contains the die ID (optional). > > > > The next cell contains the interrupt number. > > - HW IRQs: interrupt number > > @@ -98,6 +101,20 @@ properties: > > - apple,fiq-index > > - cpus > > > > +if: > > Put it under allOf. After "required:", just like example-schema asks for. moved > > + properties: > > + compatible: > > + contains: > > + const: apple,t8112-aic > > +then: > > + properties: > > + '#interrupt-cells': > > + maximum: 3 > > Shouldn't this be: > const: 3 same effect but more explicit, bot changed > > +else: > > + properties: > > + '#interrupt-cells': > > + minimum: 4 > > const: 4 thanks Janne