From patchwork Fri Jun 21 08:07:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 13707071 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 47179C2BA1A for ; Fri, 21 Jun 2024 08:07:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=e6g4eHPvTWfGHVZDfp+ZARyNow6XctUATkraIv2I+6g=; b=P/lGYp2UTzroWV8XTqC0wya7g1 LxGe5orrWFNXikL3ZpVOkqZ/IPUXj9WeQNr0U0kGsdsNzsf+NgWLjZQCwvuzldauCmPUfHuoz3DHC L2/eB2F9XsyusHT0qztMSgBRAXt9jzGRoYh9VKXS0ZgdRUgXTsLAoTeAIWD9oFpAYw1Q6rCGj76nP jVTFedRTkOpovKk4M6CAjppBAuHtFOIWz1uzZTd5fRuvlEeTWf2sClJ1jkyiL3vxgiS47iCtjE2V0 rHqw+7FRQu7MtlqfBCw7bQ4lon9GJl1TFCHfBeQCnm9UHJomhLzX7+Oo8mPyjLujWUZUvk9x6soui rIXmgOYg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sKZJ1-00000008GXH-2wRp; Fri, 21 Jun 2024 08:07:35 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sKZIx-00000008GTz-2g8x for linux-arm-kernel@lists.infradead.org; Fri, 21 Jun 2024 08:07:33 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 5B98ACE0B04; Fri, 21 Jun 2024 08:07:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6CA9DC2BBFC; Fri, 21 Jun 2024 08:07:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718957247; bh=1QkgOztAYGhK2udxTzVzSKcc4uUQRYcY30IrA8sSEpY=; h=From:List-Id:To:Cc:Subject:Date:From; b=ZqyFqPmoOZfY9GYJI2n33VZVtSp/Rm2lWYkThA9Q/jh8cT3mG2Ew2gvFmgzEcnWg5 VRPmtQ9TmaOIRqxBVdDguYRfgNgWdzrTSeaUnsl004X4aoRhrwiAa/fnbpAIDHPzS6 9tzsXI6zjgMeD7+aoAdjUSKXlD1eSB9Sr3eo4w9ya9S9/PVIaztCllMMUnESDtXvo0 lqBI1ONIPPRHjdTjPaVJ8GtDNkIIph+iDU/wv8P7gviHnkhRo4TEYIIV2sYiNJv6Z+ vwqdaPqen4TzLt5/9DdgJwgiTKFfPxWGSOc0jR9PjlqITxhNiREKqXhi2TPHwCgOfM iRREFmeogj6BQ== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, soc@kernel.org Cc: =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH 1/2] ARM: dts: armada-{370-xp,375,38x,39x}: Drop #size-cells from mpic node Date: Fri, 21 Jun 2024 10:07:19 +0200 Message-ID: <20240621080719.20380-1-kabel@kernel.org> X-Mailer: git-send-email 2.44.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240621_010732_064895_01AFD9DA X-CRM114-Status: UNSURE ( 8.42 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The marvell,mpic interrupt controller has no children nodes. Drop the Signed-off-by: Marek Behún --- arch/arm/boot/dts/marvell/armada-370-xp.dtsi | 1 - arch/arm/boot/dts/marvell/armada-375.dtsi | 1 - arch/arm/boot/dts/marvell/armada-38x.dtsi | 1 - arch/arm/boot/dts/marvell/armada-39x.dtsi | 1 - 4 files changed, 4 deletions(-) diff --git a/arch/arm/boot/dts/marvell/armada-370-xp.dtsi b/arch/arm/boot/dts/marvell/armada-370-xp.dtsi index 0b8c2a64b36f..954c891e5aee 100644 --- a/arch/arm/boot/dts/marvell/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/marvell/armada-370-xp.dtsi @@ -168,7 +168,6 @@ mbusc: mbus-controller@20000 { mpic: interrupt-controller@20a00 { compatible = "marvell,mpic"; #interrupt-cells = <1>; - #size-cells = <1>; interrupt-controller; msi-controller; }; diff --git a/arch/arm/boot/dts/marvell/armada-375.dtsi b/arch/arm/boot/dts/marvell/armada-375.dtsi index ddc49547d786..99778b4b7e7b 100644 --- a/arch/arm/boot/dts/marvell/armada-375.dtsi +++ b/arch/arm/boot/dts/marvell/armada-375.dtsi @@ -376,7 +376,6 @@ mpic: interrupt-controller@20a00 { compatible = "marvell,mpic"; reg = <0x20a00 0x2d0>, <0x21070 0x58>; #interrupt-cells = <1>; - #size-cells = <1>; interrupt-controller; msi-controller; interrupts = ; diff --git a/arch/arm/boot/dts/marvell/armada-38x.dtsi b/arch/arm/boot/dts/marvell/armada-38x.dtsi index 01d2288bbdae..1c84cc317560 100644 --- a/arch/arm/boot/dts/marvell/armada-38x.dtsi +++ b/arch/arm/boot/dts/marvell/armada-38x.dtsi @@ -408,7 +408,6 @@ mpic: interrupt-controller@20a00 { compatible = "marvell,mpic"; reg = <0x20a00 0x2d0>, <0x21070 0x58>; #interrupt-cells = <1>; - #size-cells = <1>; interrupt-controller; msi-controller; interrupts = ; diff --git a/arch/arm/boot/dts/marvell/armada-39x.dtsi b/arch/arm/boot/dts/marvell/armada-39x.dtsi index 9d1cac49c022..6d05835efb42 100644 --- a/arch/arm/boot/dts/marvell/armada-39x.dtsi +++ b/arch/arm/boot/dts/marvell/armada-39x.dtsi @@ -268,7 +268,6 @@ mpic: interrupt-controller@20a00 { compatible = "marvell,mpic"; reg = <0x20a00 0x2d0>, <0x21070 0x58>; #interrupt-cells = <1>; - #size-cells = <1>; interrupt-controller; msi-controller; interrupts = ; From patchwork Fri Jun 21 08:23:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 13707094 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 05EC7C2BA1A for ; Fri, 21 Jun 2024 08:23:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Ci97u2EQnE6kH5iAojqcUWnKbu9tzzrzB/iJ/pxDBU4=; b=Yj+F5cL4T1LRYpkqHRV7O5s3C9 gMxXpQulN7Xvqfnv6BZnl2y9RFCkugqRFmf7DlFpyt0DzCQNHTmJOYZZxcdk62d6d19zAgjUAPaw7 eHQGR6v866MOMedmoTzncRjw2r6SywA0doL1qhNLcv3V+i12KxfH5vb9XqV1o89O742R0H9atQCjz 546z+QBGg0n8RfcLn26u9TTIM8Xge2nr3vRQ0pC0cP/Fy8jbKFcA6gyqZWrz8WSOD6+vXgnewx3Nc WZQcLr/bjkggDEsTXq4reejDfYq/cDqW3WSYrkNcQLrf6tGbK5MQsJmVcJDnpuelDqR7auNHiB5Op hD++sLxg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sKZYM-00000008KCC-08Dw; Fri, 21 Jun 2024 08:23:26 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sKZYI-00000008KAm-1iFl for linux-arm-kernel@lists.infradead.org; Fri, 21 Jun 2024 08:23:24 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 80089CE23AC; Fri, 21 Jun 2024 08:23:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53281C32781; Fri, 21 Jun 2024 08:23:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718958199; bh=6OAO8od/+Z5WA17/lFyMhf6eWCujfX1iV3HKhszXrVc=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=BY/5yKC6C/WPaR4MyqUPnBX7hjZOj5KdU6opuUMilYLce5nRAojZo5ROGhmMU370U dlYkrsgylYRKzu1WOHJJOPcELdzSpv6Dc7KjC3y5YxkYy9JpMx8eUG67IIvlZXpvBQ KPyC0MeKmasjdl1mPyzZkqIQmJmFXMGcHL4xbUkvc0J3L7yn7OnMtyKzoWMaFtXi3I 6HgW2Z3v/w65WR9/tDoTPTK61LQPWrSEkjwts5wEvoG/d8uzawQg/7tTfykrpcWQ1M pfJs8v+Zp7DLfiAJSyCAb64xo/HbPnzJ/Eqb1uph1OYrkvjtLbEfW5Xymx6NSHAxB/ C2S83Mp5TeM5Q== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, soc@kernel.org, Thomas Gleixner Cc: =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH 2/2] dt-bindings: interrupt-controller: convert marvell,mpic binding to YAML Date: Fri, 21 Jun 2024 10:23:13 +0200 Message-ID: <20240621082313.6605-1-kabel@kernel.org> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240621080719.20380-1-kabel@kernel.org> References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240621_012323_039531_E7B9C66A X-CRM114-Status: GOOD ( 20.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Convert the marvell,mpic device-tree binding to YAML. Add myself as maintainer. Signed-off-by: Marek Behún --- .../marvell,armada-370-xp-mpic.txt | 38 ------------ .../interrupt-controller/marvell,mpic.yaml | 62 +++++++++++++++++++ MAINTAINERS | 1 + 3 files changed, 63 insertions(+), 38 deletions(-) delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,armada-370-xp-mpic.txt create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml diff --git a/Documentation/devicetree/bindings/interrupt-controller/marvell,armada-370-xp-mpic.txt b/Documentation/devicetree/bindings/interrupt-controller/marvell,armada-370-xp-mpic.txt deleted file mode 100644 index 5fc03134a999..000000000000 --- a/Documentation/devicetree/bindings/interrupt-controller/marvell,armada-370-xp-mpic.txt +++ /dev/null @@ -1,38 +0,0 @@ -Marvell Armada 370, 375, 38x, XP Interrupt Controller ------------------------------------------------------ - -Required properties: -- compatible: Should be "marvell,mpic" -- interrupt-controller: Identifies the node as an interrupt controller. -- msi-controller: Identifies the node as an PCI Message Signaled - Interrupt controller. -- #interrupt-cells: The number of cells to define the interrupts. Should be 1. - The cell is the IRQ number - -- reg: Should contain PMIC registers location and length. First pair - for the main interrupt registers, second pair for the per-CPU - interrupt registers. For this last pair, to be compliant with SMP - support, the "virtual" must be use (For the record, these registers - automatically map to the interrupt controller registers of the - current CPU) - -Optional properties: - -- interrupts: If defined, then it indicates that this MPIC is - connected as a slave to another interrupt controller. This is - typically the case on Armada 375 and Armada 38x, where the MPIC is - connected as a slave to the Cortex-A9 GIC. The provided interrupt - indicate to which GIC interrupt the MPIC output is connected. - -Example: - - mpic: interrupt-controller@d0020000 { - compatible = "marvell,mpic"; - #interrupt-cells = <1>; - #address-cells = <1>; - #size-cells = <1>; - interrupt-controller; - msi-controller; - reg = <0xd0020a00 0x1d0>, - <0xd0021070 0x58>; - }; diff --git a/Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml b/Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml new file mode 100644 index 000000000000..5318d4a7716a --- /dev/null +++ b/Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml @@ -0,0 +1,62 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/interrupt-controller/marvell,mpic.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Marvell Armada 370, 375, 38x, 39x, XP Interrupt Controller + +maintainers: + - Marek Behún + +description: | + The top-level interrupt controller on Marvell Armada 370 and XP. On these + platforms it also provides inter-processor interrupts. + + On Marvell Armada 375, 38x and 39x this controller is wired under ARM GIC. + + Provides MSI handling for the PCIe controllers. + +properties: + compatible: + const: marvell,mpic + + reg: + items: + - description: main registers + - description: per-cpu registers + + interrupts: + items: + - description: | + Parent interrupt on platforms where MPIC is not the top-level + interrupt controller. + + interrupt-controller: true + + '#interrupt-cells': + const: 1 + + msi-controller: true + +required: + - compatible + - reg + - interrupt-controller + - msi-controller + +additionalProperties: false + +examples: + - | + #include + #include + + interrupt-controller@20a00 { + compatible = "marvell,mpic"; + reg = <0x20a00 0x2d0>, <0x21070 0x58>; + interrupts = ; + interrupt-controller; + #interrupt-cells = <1>; + msi-controller; + }; diff --git a/MAINTAINERS b/MAINTAINERS index b68c8b25bb93..5506e3141d92 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2211,6 +2211,7 @@ F: Documentation/ABI/testing/sysfs-firmware-turris-mox-rwtm F: Documentation/devicetree/bindings/bus/moxtet.txt F: Documentation/devicetree/bindings/firmware/cznic,turris-mox-rwtm.txt F: Documentation/devicetree/bindings/gpio/gpio-moxtet.txt +F: Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml F: Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml F: Documentation/devicetree/bindings/watchdog/armada-37xx-wdt.txt F: drivers/bus/moxtet.c