From patchwork Wed Jan 31 21:26:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Duje_Mihanovi=C4=87?= X-Patchwork-Id: 13539988 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 9E49CC47258 for ; Wed, 31 Jan 2024 21:35:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nzGBiLJEIhdauIRRTkwTig8xAmiGRYuPY73z0qEwWuU=; b=19e0h3iiVx5/uf 4g4h3h4fd/kL5K7dqgSoiimw0h/GztT+1esdAY88VSx79gglyltgTAg5wZ2+PUVODQrGpqgBADTNv /PXz/9eUSYqz6+/aBdgpclrP/niZwrpAHHxU0JXEMGSN/yHzqYyqyAiaMCvj26SFJbck7sPadFGF0 wfvGJZWjY8QyKge7DFXA6hQjqV0FekOkTtGah/YuI8iA5dVbZm9q+NieljNnsUY0xgd8JWzoAobfg lfyXLVZ486pZVI48zGyNBSnlxvFjfsYf7O5w1BqyUb/Az4DdwqAqUxYnG6JwKuYUXNrNGooHkX8jP EaUY+1P0+N09unZSKZSg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVIEl-00000005ZJD-0U9r; Wed, 31 Jan 2024 21:35:15 +0000 Received: from mx1.hosting.skole.hr ([161.53.165.185] helo=mx.skole.hr) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVIEh-00000005ZI6-3Qob for linux-arm-kernel@lists.infradead.org; Wed, 31 Jan 2024 21:35:13 +0000 Received: from mx1.hosting.skole.hr (localhost.localdomain [127.0.0.1]) by mx.skole.hr (mx.skole.hr) with ESMTP id 57FDC84012; Wed, 31 Jan 2024 22:26:59 +0100 (CET) From: =?utf-8?q?Duje_Mihanovi=C4=87?= Date: Wed, 31 Jan 2024 22:26:02 +0100 Subject: [PATCH v2 1/2] ARM: dts: mmp2: drop iram property MIME-Version: 1.0 Message-Id: <20240131-pxa-dma-yaml-v2-1-9611d0af0edc@skole.hr> References: <20240131-pxa-dma-yaml-v2-0-9611d0af0edc@skole.hr> In-Reply-To: <20240131-pxa-dma-yaml-v2-0-9611d0af0edc@skole.hr> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Lubomir Rintel Cc: dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?utf-8?q?Duje_Mihanovi=C4=87?= X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=728; i=duje.mihanovic@skole.hr; h=from:subject:message-id; bh=buBAlLs39uQNi21shfxdafiuOZnjkE6bEZ9Dhre1+VU=; b=owEBbQKS/ZANAwAIAZoRnrBCLZbhAcsmYgBlurr2Wz3mWQu2FtJfvWIzRVHlqwYl45LQLZLEm 7jcVpIGTjeJAjMEAAEIAB0WIQRT351NnD/hEPs2LXiaEZ6wQi2W4QUCZbq69gAKCRCaEZ6wQi2W 4eu2EACs/rH2sFH3hlthYJ9ZiEI6DpdNhJfGSIeKGSOljLJvaao9WIThTjl0trs6iR9Et2pDdET d1YBDYtPHzf9WC7nHb9DRJy1cGiigFFdhn9Dov0EsdpEmAC099TG0XQVxxc5hPuLdzAKOiQyEmm C/fxNxr5/7qHJvgDl/bWUVh1h5Igri5W470LZ3HklxsOYzlDlBpj8QdUl0NXaSH4YcSxdso4NOp 46p+CuBs+GI5HYKik4BFLsaMpKGDmOLPjNSPbozwosgG8VlsAmHzZ/v90m2VHKeQ3BBC7NYQPRI X1aXBQz4A1OUXJYP/JzHv/3/UxgB2ignDQxYaBgxAs8QM/eAMLMFcmqj4MGXIlay671sq6nw7ld raWY0U1TzjD3QThDMSRKZw1kijgVDYBixf+bgDvHLIu5SBB+VmXkb4NqDRlqKLxuzqn0WUUqpir QKnAjaWYSgrbvZgeIT6pEsKoBtIgjSQXY6KirH6RWaXyh2ZfV1o5jKM48BL+nBxv1Fho4O0bvit 6KMNoq0bjC3AV0r4eLt/a5AoGnT8wHqCOn70w12Cu/u2q8gvamXT0nRHRTmakyaSip/trx8yOs5 xRR3RUZ+7mSd8yVnwDRQCScEYgA2iA2tZF87TxRu4FYu4vbIu9ZbdT0VzfJACrZbuSemVmw7RgX 913/NPw5IhmzQkA== X-Developer-Key: i=duje.mihanovic@skole.hr; a=openpgp; fpr=53DF9D4D9C3FE110FB362D789A119EB0422D96E1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240131_133512_024550_5DDFB1A5 X-CRM114-Status: GOOD ( 10.17 ) 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 iram property appears to be a duplicate of the asram property, with the difference that it's not used by the mmp-tdma driver anyway. Drop it from the SoC dtsi. Signed-off-by: Duje Mihanović --- arch/arm/boot/dts/marvell/mmp2.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/boot/dts/marvell/mmp2.dtsi b/arch/arm/boot/dts/marvell/mmp2.dtsi index 987d792f67ea..1c0a1b58373c 100644 --- a/arch/arm/boot/dts/marvell/mmp2.dtsi +++ b/arch/arm/boot/dts/marvell/mmp2.dtsi @@ -212,7 +212,6 @@ adma0: dma-controller@d42a0800 { interrupts = <48>; #dma-cells = <1>; asram = <&asram>; - iram = <&asram>; status = "disabled"; }; From patchwork Wed Jan 31 21:26:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Duje_Mihanovi=C4=87?= X-Patchwork-Id: 13539990 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 37394C47258 for ; Wed, 31 Jan 2024 21:36:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ctccbDZGxlg/2KIdUaxkQLs13bqd4l4zuH1Jw058Oyc=; b=NYFLyHwTl+TyXc yws2b7hKlW7m5RQtJhlrz4N7Ha2ikR5n/2ftSKhuusXM5q8WNeBi0Gzl1vDrNtHv8coHbGPpvfKJA UYmTKjolSvzaTPafMYH761UjgEyAndehQITU1SSRzwYCCco9Hola03uAg+9L+VlI2sdt9GoitCtd+ FIGr4FuxuUxBOlglpe72umMS0YHYNU1L1r9M/CHsjCxnPIWZNUDeMKgyuUp8m4AA/fIaoPirr9qdb aKSx7atC8pWUBh/zY0vTviXTUC574icUdPywnnsH0tPUsL+xqCQzV49vQrH7wx5GiLK7bVaOZZKje EaGC9je2eEKSNLWSrhcQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVIG5-00000005ZWo-2Qwp; Wed, 31 Jan 2024 21:36:37 +0000 Received: from mx2.hosting.skole.hr ([161.53.165.186] helo=mx.skole.hr) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVIG2-00000005ZW5-30an for linux-arm-kernel@lists.infradead.org; Wed, 31 Jan 2024 21:36:36 +0000 Received: from mx2.hosting.skole.hr (localhost.localdomain [127.0.0.1]) by mx.skole.hr (mx.skole.hr) with ESMTP id 2BD3E85458; Wed, 31 Jan 2024 22:27:00 +0100 (CET) From: =?utf-8?q?Duje_Mihanovi=C4=87?= Date: Wed, 31 Jan 2024 22:26:03 +0100 Subject: [PATCH v2 2/2] dt-bindings: mmp-dma: convert to YAML MIME-Version: 1.0 Message-Id: <20240131-pxa-dma-yaml-v2-2-9611d0af0edc@skole.hr> References: <20240131-pxa-dma-yaml-v2-0-9611d0af0edc@skole.hr> In-Reply-To: <20240131-pxa-dma-yaml-v2-0-9611d0af0edc@skole.hr> To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Lubomir Rintel Cc: dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?utf-8?q?Duje_Mihanovi=C4=87?= X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=5281; i=duje.mihanovic@skole.hr; h=from:subject:message-id; bh=uVGvn5v3uULObvAaf3HZa/wtMRXqXaT8sHbkcl4AM74=; b=owEBbQKS/ZANAwAIAZoRnrBCLZbhAcsmYgBlurr28BlvrjNxs/aFdU/EAgxMD0nSWupIBhMn4 0Y8td+J3fKJAjMEAAEIAB0WIQRT351NnD/hEPs2LXiaEZ6wQi2W4QUCZbq69gAKCRCaEZ6wQi2W 4Z+FEACklOwkgEUQkLD0n5IeZH3nI12sq64yycJO8TELm84kZdc8b8IBO9M67LOwFQPjHg2CNKX nt+QbFSGCoaMQgC8yI6w7+nCUMzKtDL6NVLc2tBMfbZs7l2BfIEiAAL1twS+MAXz7xydwNDx/JD +I9OxH4SZCK4UCG0xPr3Tast9Zfzx9sCn9mLXBwN6Q5yqMeiKos3plSc/84HW/RInOvWboxmWYA yk4jJQ1GoT2mwKnJXlWKVP3ZZmxYKqmxf8bJkujDklYyIZwOzXO7aai3JKRQnPOmptg6A0K250x j+jus28Okw5K3JNFwo06jI1KAxYbP4Dp8YO/5TW5COdXzC49aP3ySK7ybTiPnL1K9x8dC36Zt50 gyN/MxGWFWvlRJmMRs2rJyEhHwusmMCA3awYdsVLyC9ihVw9Uvxscw+z5m+abZV8CGWtivELH3X GxRELzKUE/J0rfRLMqVJp+FHTfd4h6dSq4GntPoeZfHcOItx9um6lgu6ObYwU+aJIfmU/yTTL7U pxKLbc3FBUXQAb4WwyUk+zCmlMKqkB8juHRxbwmfGrfoP5oWWgN+fnbTlyuu1r9T6KmBfrjdFPh 57XiR/dj8qT9z2Yc5wqMlFssfwOFXBkbYfV980lhXY4DlCS3k+6Gfwca9jxai/VUzPM6QbDB2Ia rZTNXBYucQc3jNw== X-Developer-Key: i=duje.mihanovic@skole.hr; a=openpgp; fpr=53DF9D4D9C3FE110FB362D789A119EB0422D96E1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240131_133634_925535_F9FAAD76 X-CRM114-Status: GOOD ( 17.67 ) 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 MMP DMA binding to YAML. The TXT binding mentions that the controller may have one IRQ per DMA channel. Examples of this were dropped in the YAML binding because of dt_binding_check complaints (either too many interrupt cells or interrupts) and the fact that this is not used in any of the in-tree device trees. Signed-off-by: Duje Mihanović Reviewed-by: Rob Herring --- .../devicetree/bindings/dma/marvell,mmp-dma.yaml | 72 +++++++++++++++++++ Documentation/devicetree/bindings/dma/mmp-dma.txt | 81 ---------------------- 2 files changed, 72 insertions(+), 81 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/marvell,mmp-dma.yaml b/Documentation/devicetree/bindings/dma/marvell,mmp-dma.yaml new file mode 100644 index 000000000000..d447d5207be0 --- /dev/null +++ b/Documentation/devicetree/bindings/dma/marvell,mmp-dma.yaml @@ -0,0 +1,72 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/dma/marvell,mmp-dma.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Marvell MMP DMA controller + +maintainers: + - Duje Mihanović + +description: + Marvell MMP SoCs may have two types of DMA controllers, peripheral and audio. + +properties: + compatible: + enum: + - marvell,pdma-1.0 + - marvell,adma-1.0 + - marvell,pxa910-squ + + reg: + maxItems: 1 + + interrupts: + description: + Interrupt lines for the controller, may be shared or one per DMA channel + minItems: 1 + + asram: + description: + A phandle to the SRAM pool + $ref: /schemas/types.yaml#/definitions/phandle + + '#dma-channels': + deprecated: true + + '#dma-requests': + deprecated: true + +required: + - compatible + - reg + - interrupts + - '#dma-cells' + +allOf: + - $ref: dma-controller.yaml# + - if: + properties: + compatible: + contains: + enum: + - marvell,pdma-1.0 + then: + properties: + asram: false + else: + required: + - asram + +unevaluatedProperties: false + +examples: + - | + dma-controller@d4000000 { + compatible = "marvell,pdma-1.0"; + reg = <0xd4000000 0x10000>; + interrupts = <47>; + #dma-cells = <2>; + dma-channels = <16>; + }; diff --git a/Documentation/devicetree/bindings/dma/mmp-dma.txt b/Documentation/devicetree/bindings/dma/mmp-dma.txt deleted file mode 100644 index ec18bf0a802a..000000000000 --- a/Documentation/devicetree/bindings/dma/mmp-dma.txt +++ /dev/null @@ -1,81 +0,0 @@ -* MARVELL MMP DMA controller - -Marvell Peripheral DMA Controller -Used platforms: pxa688, pxa910, pxa3xx, etc - -Required properties: -- compatible: Should be "marvell,pdma-1.0" -- reg: Should contain DMA registers location and length. -- interrupts: Either contain all of the per-channel DMA interrupts - or one irq for pdma device - -Optional properties: -- dma-channels: Number of DMA channels supported by the controller (defaults - to 32 when not specified) -- #dma-channels: deprecated -- dma-requests: Number of DMA requestor lines supported by the controller - (defaults to 32 when not specified) -- #dma-requests: deprecated - -"marvell,pdma-1.0" -Used platforms: pxa25x, pxa27x, pxa3xx, pxa93x, pxa168, pxa910, pxa688. - -Examples: - -/* - * Each channel has specific irq - * ICU parse out irq channel from ICU register, - * while DMA controller may not able to distinguish the irq channel - * Using this method, interrupt-parent is required as demuxer - * For example, pxa688 icu register 0x128, bit 0~15 is PDMA channel irq, - * 18~21 is ADMA irq - */ -pdma: dma-controller@d4000000 { - compatible = "marvell,pdma-1.0"; - reg = <0xd4000000 0x10000>; - interrupts = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15>; - interrupt-parent = <&intcmux32>; - dma-channels = <16>; - }; - -/* - * One irq for all channels - * Dmaengine driver (DMA controller) distinguish irq channel via - * parsing internal register - */ -pdma: dma-controller@d4000000 { - compatible = "marvell,pdma-1.0"; - reg = <0xd4000000 0x10000>; - interrupts = <47>; - dma-channels = <16>; - }; - - -Marvell Two Channel DMA Controller used specifically for audio -Used platforms: pxa688, pxa910 - -Required properties: -- compatible: Should be "marvell,adma-1.0" or "marvell,pxa910-squ" -- reg: Should contain DMA registers location and length. -- interrupts: Either contain all of the per-channel DMA interrupts - or one irq for dma device - -"marvell,adma-1.0" used on pxa688 -"marvell,pxa910-squ" used on pxa910 - -Examples: - -/* each channel has specific irq */ -adma0: dma-controller@d42a0800 { - compatible = "marvell,adma-1.0"; - reg = <0xd42a0800 0x100>; - interrupts = <18 19>; - interrupt-parent = <&intcmux32>; - }; - -/* One irq for all channels */ -squ: dma-controller@d42a0800 { - compatible = "marvell,pxa910-squ"; - reg = <0xd42a0800 0x100>; - interrupts = <46>; - };