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 7C43DC678D4 for ; Tue, 7 Mar 2023 12:10:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231508AbjCGMKf (ORCPT ); Tue, 7 Mar 2023 07:10:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231411AbjCGMKP (ORCPT ); Tue, 7 Mar 2023 07:10:15 -0500 Received: from soltyk.jannau.net (soltyk.jannau.net [144.76.91.90]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CDD9574F7; Tue, 7 Mar 2023 04:10:14 -0800 (PST) Received: from robin.home.jannau.net (p54accbe8.dip0.t-ipconnect.de [84.172.203.232]) by soltyk.jannau.net (Postfix) with ESMTPSA id 12DDF26F88A; Tue, 7 Mar 2023 13:10:12 +0100 (CET) From: Janne Grunau Date: Tue, 07 Mar 2023 13:10:11 +0100 Subject: [PATCH v3 05/15] dt-bindings: interrupt-controller: apple,aic2: Add apple,t8112-aic compatible MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230202-asahi-t8112-dt-v3-5-d1a5f6383d95@jannau.net> References: <20230202-asahi-t8112-dt-v3-0-d1a5f6383d95@jannau.net> In-Reply-To: <20230202-asahi-t8112-dt-v3-0-d1a5f6383d95@jannau.net> To: Hector Martin , Sven Peter , Alyssa Rosenzweig , Rob Herring , Krzysztof Kozlowski , Mark Kettenis Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Janne Grunau , Marc Zyngier X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1922; i=j@jannau.net; h=from:subject:message-id; bh=AibLTj6QTncN8IwWQQoAipjlxWNMIT6q7M88xOQXxf0=; b=owGbwMvMwCG2UNrmdq9+ahrjabUkhhR2zQUthncWCDB1ey5/vHSNp4X5yh5BVd22sKSpG6tN3 UUY9y7tKGVhEONgkBVTZEnSftnBsLpGMab2QRjMHFYmkCEMXJwCMJHnoYwM3UbKz99cvLSv+sZp 2fOmd2777azoOLCMKUvcvtx4Wc3U2wz/DH/k+a7eoBMnVvteNSjaXjT6if/22nnS1t3fsvY+Zzz HAAA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Acked-by: Marc Zyngier Signed-off-by: Janne Grunau --- .../bindings/interrupt-controller/apple,aic2.yaml | 22 +++++++++++++++++++--- 1 file changed, 19 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..2bde6cc6fe0a 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 (only present on apple,t6000-aic). The next cell contains the interrupt number. - HW IRQs: interrupt number @@ -109,6 +112,19 @@ additionalProperties: false allOf: - $ref: /schemas/interrupt-controller.yaml# + - if: + properties: + compatible: + contains: + const: apple,t8112-aic + then: + properties: + '#interrupt-cells': + const: 3 + else: + properties: + '#interrupt-cells': + const: 4 examples: - | -- 2.39.2