From patchwork Tue May 3 06:54:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12835086 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 60CC3C433F5 for ; Tue, 3 May 2022 06:54:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231364AbiECG6T (ORCPT ); Tue, 3 May 2022 02:58:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231274AbiECG6K (ORCPT ); Tue, 3 May 2022 02:58:10 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 782EE2183F for ; Mon, 2 May 2022 23:54:13 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id a1so18846559edt.3 for ; Mon, 02 May 2022 23:54:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fbr9VzhYtH1KQia9kQjc/iWRHBu+/GHX1fXDlV9Qp10=; b=taH+615Te3bYmh19ehO9DwAHEfYNduM3QpunHXljirkjB/R++x6QkiMV4/97GeXsz5 aT7dZuryJ4H9UYWq7HEB6uz5SWwDAD4v8NUrRjkFf4m04IEFewxerdw7SvtTiuyOill9 bfE/9KS1edAbUp4yyUUyZuE47t6cve45RcHOg+jJ9dZRw9aHTFG5UJSTlNnbxYfrohyx JH67v2H9zegyf3N8BpF0+EfRTgynQZg76uoFd7CQSNdGbBmGW1pZsb1gDpwFXrec3Cpn BdUZzeFehPWxpYUNf5MThdarjRW272ar8wnffWIRwLGXqun26xkCKO8NWmqhf4oCXXCf ZsYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fbr9VzhYtH1KQia9kQjc/iWRHBu+/GHX1fXDlV9Qp10=; b=4evpAWyOKbjllw8giFVJ1gv/c+lVcR4ZiJ5blaq2qPPcpbIkQDVSFkc3KAtJAZlZ3Y 5/L22IGrl8k+QAkj48mE5XVJtIbcZIqJsNY5bHhF8OXroi+3bQvn2GOEuPA5bktWYBTX /0+eA11Lq1DRc6m96QBPsjkfGgeKrf67KWrLIvYrjZGNK041HlR/xnaWg30VWeKoTc7w K75YlPcha8bVHoVIgsik9IT4/9wIPlLLtWhJFDZbMMNnKQo1MRRGpulXJBbStLss35/p PksvdIi5U+3q7A5YiTklP0ukCg9W9Tnu6yT7xDmn62DzUpwg0YJn5kKYU09X/qFv2eQY vIig== X-Gm-Message-State: AOAM532J5bT1mKSJxoabFvLt3HIuj/UD1qfnlM3kUB4xpkrYQupPj5vX L9yFoFHBaP5MKezEUa3g/z+LFw== X-Google-Smtp-Source: ABdhPJyuiSY1Y+8unsHjhPEOleQKUh9CluUqqJLDo59OOwbpWvojeb6rDWDCTfNn4Lq2qaa99AOi5A== X-Received: by 2002:a05:6402:2792:b0:427:e39b:f396 with SMTP id b18-20020a056402279200b00427e39bf396mr1899811ede.226.1651560851962; Mon, 02 May 2022 23:54:11 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id l23-20020aa7c3d7000000b0042617ba6396sm7565326edr.32.2022.05.02.23.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 23:54:11 -0700 (PDT) From: Krzysztof Kozlowski To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Lubomir Rintel , Daniel Mack , Haojian Zhuang , Robert Jarzmik , dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Krzysztof Kozlowski , Rob Herring Subject: [PATCH v2 1/4] dt-bindings: dmaengine: mmp: deprecate '#dma-channels' and '#dma-requests' Date: Tue, 3 May 2022 08:54:04 +0200 Message-Id: <20220503065407.52188-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220503065407.52188-1-krzysztof.kozlowski@linaro.org> References: <20220503065407.52188-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org The generic properties, used in most of the drivers and defined in generic dma-common DT bindings, are 'dma-channels' and 'dma-requests'. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/dma/mmp-dma.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/mmp-dma.txt b/Documentation/devicetree/bindings/dma/mmp-dma.txt index 8f7364a7b349..ec18bf0a802a 100644 --- a/Documentation/devicetree/bindings/dma/mmp-dma.txt +++ b/Documentation/devicetree/bindings/dma/mmp-dma.txt @@ -10,10 +10,12 @@ Required properties: or one irq for pdma device Optional properties: -- #dma-channels: Number of DMA channels supported by the controller (defaults +- dma-channels: Number of DMA channels supported by the controller (defaults to 32 when not specified) -- #dma-requests: Number of DMA requestor lines supported by the controller +- #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. @@ -33,7 +35,7 @@ pdma: dma-controller@d4000000 { 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>; + dma-channels = <16>; }; /* @@ -45,7 +47,7 @@ pdma: dma-controller@d4000000 { compatible = "marvell,pdma-1.0"; reg = <0xd4000000 0x10000>; interrupts = <47>; - #dma-channels = <16>; + dma-channels = <16>; }; From patchwork Tue May 3 06:54:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12835087 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 0E204C433EF for ; Tue, 3 May 2022 06:54:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231560AbiECG6V (ORCPT ); Tue, 3 May 2022 02:58:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231452AbiECG6L (ORCPT ); Tue, 3 May 2022 02:58:11 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73956222A9 for ; Mon, 2 May 2022 23:54:14 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id g6so31699500ejw.1 for ; Mon, 02 May 2022 23:54:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=31n4NKx1muSic9R+KSUXp8YhkBAU/fz0QvMncbQEELc=; b=Z5OIn2rGyBFk1Z0vLmDQ388oecgW+5bheVurOGOOLeKLfpQMU/B0yOM6ZWJfiGK7qd 0DCYzPrCJ+5W/frYoExpIvaiU9h9meCDGS50IlADuFtCVv9NLSC6cvj+StOhCh7IUWQm Cc1pVuYmnVfxpeZfxEr5j8x40k+ZfNzbNNYCXEH+hfUxcBLspZUCLK0tKCKhLrhCfkno 9BlR3PiImyJK2Hf7rdvOQgpGV1//1g5z3g6VBjh9KoXN1ONPAZ8h0ad0La1e/hErSKl9 RPe7P6RiKVoL8IOaXnMdaAr4s+fii8ZiRjaQTygT59ozkDNR678+FD3WKbx8VKk864NX pzmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=31n4NKx1muSic9R+KSUXp8YhkBAU/fz0QvMncbQEELc=; b=ePaubD4CK3U2kk3mfv0E0our8ne4EhuuMTep7jbNzRLL1zReCyhy/WQPg0SZGtFGi+ BNVVMBeLWcc8p4fD5cYhr4Z4ehzRuOeYkMlBGNBcWxN6efyuSg3lQZE1GERYziT2NEdu TfnUSOH7jbCO/3ISHsmexWjfoAbva2Y+3R7gmkcXzzRDRtPg8MYtsQ6RB2wNuZgGI36T tO8CRBcSw6xG3Ye9tghxxDnn1B4ta1F3M6mlgIJ3gWC+YEo/LyjjX3/1crOAvx5RNJSd JefTFugBqqAhrlwTudVVzDiHCltmSpiDd/5uomFd0xxIVfXedoPuVz3w6HGVGP5ELSOU PJOw== X-Gm-Message-State: AOAM530V7QYykeFaQAjbr1gMZB58LXv8qh1kwIfVeNjqIIkwrVrM6AX8 HSuQL9BjwrPPBJCZl5jc9VcbdQ== X-Google-Smtp-Source: ABdhPJzDXkyPokM0IM43pGWhXvxnvp8eZB1vqKbFxpPmZDLh9aEzEuzQI4DcfJhCWvBSd40FFqZaHg== X-Received: by 2002:a17:907:6e02:b0:6f3:d185:5d25 with SMTP id sd2-20020a1709076e0200b006f3d1855d25mr14343646ejc.14.1651560853020; Mon, 02 May 2022 23:54:13 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id l23-20020aa7c3d7000000b0042617ba6396sm7565326edr.32.2022.05.02.23.54.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 23:54:12 -0700 (PDT) From: Krzysztof Kozlowski To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Lubomir Rintel , Daniel Mack , Haojian Zhuang , Robert Jarzmik , dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 2/4] dmaengine: pxa: deprecate '#dma-channels' and '#dma-requests' Date: Tue, 3 May 2022 08:54:05 +0200 Message-Id: <20220503065407.52188-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220503065407.52188-1-krzysztof.kozlowski@linaro.org> References: <20220503065407.52188-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org The generic properties, used in most of the drivers and defined in generic dma-common DT bindings, are 'dma-channels' and 'dma-requests'. Switch to new properties while keeping backward compatibility. Signed-off-by: Krzysztof Kozlowski --- drivers/dma/pxa_dma.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/dma/pxa_dma.c b/drivers/dma/pxa_dma.c index 6078cc81892e..e7034f6f3994 100644 --- a/drivers/dma/pxa_dma.c +++ b/drivers/dma/pxa_dma.c @@ -1365,10 +1365,17 @@ static int pxad_probe(struct platform_device *op) of_id = of_match_device(pxad_dt_ids, &op->dev); if (of_id) { - of_property_read_u32(op->dev.of_node, "#dma-channels", - &dma_channels); - ret = of_property_read_u32(op->dev.of_node, "#dma-requests", + /* Parse new and deprecated dma-channels properties */ + if (of_property_read_u32(op->dev.of_node, "dma-channels", + &dma_channels)) + of_property_read_u32(op->dev.of_node, "#dma-channels", + &dma_channels); + /* Parse new and deprecated dma-requests properties */ + ret = of_property_read_u32(op->dev.of_node, "dma-requests", &nb_requestors); + if (ret) + ret = of_property_read_u32(op->dev.of_node, "#dma-requests", + &nb_requestors); if (ret) { dev_warn(pdev->slave.dev, "#dma-requests set to default 32 as missing in OF: %d", From patchwork Tue May 3 06:54:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12835089 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 1E316C433EF for ; Tue, 3 May 2022 06:55:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230453AbiECG6b (ORCPT ); Tue, 3 May 2022 02:58:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231462AbiECG6L (ORCPT ); Tue, 3 May 2022 02:58:11 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FD13240B7 for ; Mon, 2 May 2022 23:54:15 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id kq17so31663719ejb.4 for ; Mon, 02 May 2022 23:54:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8rzcyxWl1wMJihRThXzFaCrK82eFdfscpNcxmBTO4Zs=; b=rp2vJMX2WRd+WTVaQ+gAByXbAnWH+BH3nPt1AIbQ7cvijNLUhZuGgyhenA0yhVQfPG uWS19Gc5sw0Cwo9fi2HSZpD67a0AFpYFAUu+FDSkPNG39e0Sx1ZxADNP7bzrMieFkE/V 8I7cwqj7gLtG5QpeDaFiAjIEVz6T3rbfNTPh/cdoOKAtJTJ9t/lnpE2F/LD7EQ0vYbtm HTQRRII0xkl3ds2941iMPvF/OlTtArm0GX17CBUY6NV/OT2rQk8F2HMS6ZW78f2GplHd j3Y3clcH9BQiy9by7+RaPrellpvkMGHsA16N1spNie00vu/pjSs3NAixMIxJh58SYvLf YE3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8rzcyxWl1wMJihRThXzFaCrK82eFdfscpNcxmBTO4Zs=; b=GLLEQVN4r3iNvA2/476b/U2gQlKhkQlO4oNSWwnl9XpQFHvdZGJzP0DnQlUQIyjewI gzM+MZfC4rElcbM627BGTFHCZblkzPV29bMpoTGJ2auNvseTOvjQ4qZNUibHWVnAfmDb cjVuPYCSIDfPCxv3Sf2U0CrDKmB/OcnXx1P6h5F+2GCLmlwZUB8Isf3wuv2i4rRlcOa5 8hvpepPOCKRxP+8Rv0qNIif16sRAFOUUNQ37V0geCGgmY56yVVYtWDlQ80bEH1J9i+by 0yjFh12RCTsM8NdIldyTuHnD0g0oYz9D4MBWkqZoBKHniCHU+kzKXjI+/KPM7eY+U/6b bklA== X-Gm-Message-State: AOAM531KtxL95B15TZvVmpgtvV6GyGcw/PfAneLKmTO6UHTag6s9tzsv /vcNXGMYh8GT0KKfJcV7XO6+2w== X-Google-Smtp-Source: ABdhPJzlAgp3dhSdZgvOmwYwRgPSdCumZoCd77/K2/s+req5QrJ7sIjCLWN5Fwu2Fu5B5FKCAmrc9Q== X-Received: by 2002:a17:907:9706:b0:6f4:7ed4:db57 with SMTP id jg6-20020a170907970600b006f47ed4db57mr2916444ejc.432.1651560854100; Mon, 02 May 2022 23:54:14 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id l23-20020aa7c3d7000000b0042617ba6396sm7565326edr.32.2022.05.02.23.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 23:54:13 -0700 (PDT) From: Krzysztof Kozlowski To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Lubomir Rintel , Daniel Mack , Haojian Zhuang , Robert Jarzmik , dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 3/4] dmaengine: mmp: deprecate '#dma-channels' Date: Tue, 3 May 2022 08:54:06 +0200 Message-Id: <20220503065407.52188-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220503065407.52188-1-krzysztof.kozlowski@linaro.org> References: <20220503065407.52188-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org The generic property, used in most of the drivers and defined in generic dma-common DT bindings, is 'dma-channels'. Switch to new property while keeping backward compatibility. Signed-off-by: Krzysztof Kozlowski --- drivers/dma/mmp_pdma.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c index 5a53d7fcef01..e8d71b35593e 100644 --- a/drivers/dma/mmp_pdma.c +++ b/drivers/dma/mmp_pdma.c @@ -1043,13 +1043,17 @@ static int mmp_pdma_probe(struct platform_device *op) return PTR_ERR(pdev->base); of_id = of_match_device(mmp_pdma_dt_ids, pdev->dev); - if (of_id) - of_property_read_u32(pdev->dev->of_node, "#dma-channels", - &dma_channels); - else if (pdata && pdata->dma_channels) + if (of_id) { + /* Parse new and deprecated dma-channels properties */ + if (of_property_read_u32(pdev->dev->of_node, "dma-channels", + &dma_channels)) + of_property_read_u32(pdev->dev->of_node, "#dma-channels", + &dma_channels); + } else if (pdata && pdata->dma_channels) { dma_channels = pdata->dma_channels; - else + } else { dma_channels = 32; /* default 32 channel */ + } pdev->dma_channels = dma_channels; for (i = 0; i < dma_channels; i++) { From patchwork Tue May 3 06:54:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12835088 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 52845C433FE for ; Tue, 3 May 2022 06:55:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231147AbiECG6a (ORCPT ); Tue, 3 May 2022 02:58:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231475AbiECG6M (ORCPT ); Tue, 3 May 2022 02:58:12 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A2BD18E2E for ; Mon, 2 May 2022 23:54:16 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id z99so18827048ede.5 for ; Mon, 02 May 2022 23:54:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0Om7E3tZCgwxeaQekqleJAaOkpjdc9uO+KkphkJXZIw=; b=A5vc+vTpsI6Dz+CvfDMeY1y0K9VrnUu4BmfVN+yowooh0lh7bhFU36TXpJpn8s0khO /1u4E6S4WRv5qnTOf0jYVIczlKGwzwuCym9vysqhYZC5c+MIM1XKTmvwJvBOJdIoYtn4 W2NcUjn6L4SDNhLl5mL75j3wYzZgzOD4xg3Ia8nKZfyehozs4ylZM4VoBtJhyQG5FLB3 o8rA3+UzsrKxUtBL6qF/nYXmIku+g6RoRv4TcWl2WUTgXM0AKXpvCoZxcTbXaoaARisa SMVC7s3EgM9x6k0cpFNrVhp/I33PsdX+wQS9Bc/ktaxfavt0YRprTAJR11ro3I5p0J0U f2JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0Om7E3tZCgwxeaQekqleJAaOkpjdc9uO+KkphkJXZIw=; b=5QwE0CF7hNwrBCX8VucltMI3NxtuJtIxQ/EEkkg0beLGep5nrK+zLJGRDoGBpIXMaU cg09msSbC9hogHTegjX8yzwkRtYsG/z1eiY+b26VRS+FkBffKrlE0Ed+6vtPQrNLTDZ6 CA2vh9Dz4JSegiR1WIafp+Pf/o+6pgWRw8uvmXAP011jHHFhblYdBpQzM+0zHyglHYFk RuPT9qNdc+nekEVmFBZIra+MkwcT2ahvk66A0eJlU9ghMjHvxSDgqon3sLfVjK2SGsnI LCtygSwJHgUchgZBnWz7VNesrPXMHuFLb9QYexoX3Unphyb8/Uarb4li2621T/Tq1Qej SFsw== X-Gm-Message-State: AOAM532HxzSJbz/LnHxXAfFWqhDQlt1YxGy0t+FCg6UgcEr5Y8lfHB1L +DlINr2JKu7AOAM+1/tVmUJ7xg== X-Google-Smtp-Source: ABdhPJy/soHkx3KrZDjY+Xw2pSTuOspk0j5nJMh8MXun24XmQC02uczGjygli3btUhMvuX7AmFGX1A== X-Received: by 2002:a50:954b:0:b0:41a:c9cb:8778 with SMTP id v11-20020a50954b000000b0041ac9cb8778mr16638414eda.165.1651560855140; Mon, 02 May 2022 23:54:15 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id l23-20020aa7c3d7000000b0042617ba6396sm7565326edr.32.2022.05.02.23.54.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 23:54:14 -0700 (PDT) From: Krzysztof Kozlowski To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Lubomir Rintel , Daniel Mack , Haojian Zhuang , Robert Jarzmik , dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 4/4] ARM: dts: pxa: use new 'dma-channels/requests' properties Date: Tue, 3 May 2022 08:54:07 +0200 Message-Id: <20220503065407.52188-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220503065407.52188-1-krzysztof.kozlowski@linaro.org> References: <20220503065407.52188-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org The '#dma-channels' and '#dma-requests' properties were deprecated in favor of these defined by generic dma-common DT bindings. Add new properties while keeping old ones for backwards compatibility. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/mmp2.dtsi | 2 ++ arch/arm/boot/dts/pxa25x.dtsi | 5 ++++- arch/arm/boot/dts/pxa27x.dtsi | 5 ++++- arch/arm/boot/dts/pxa3xx.dtsi | 5 ++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi index 46984d4c5224..987d792f67ea 100644 --- a/arch/arm/boot/dts/mmp2.dtsi +++ b/arch/arm/boot/dts/mmp2.dtsi @@ -275,7 +275,9 @@ dma-controller@d4000000 { compatible = "marvell,pdma-1.0"; reg = <0xd4000000 0x10000>; interrupts = <48>; + /* For backwards compatibility: */ #dma-channels = <16>; + dma-channels = <16>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/pxa25x.dtsi b/arch/arm/boot/dts/pxa25x.dtsi index a248bf038033..5f8300e356ad 100644 --- a/arch/arm/boot/dts/pxa25x.dtsi +++ b/arch/arm/boot/dts/pxa25x.dtsi @@ -38,9 +38,12 @@ pdma: dma-controller@40000000 { compatible = "marvell,pdma-1.0"; reg = <0x40000000 0x10000>; interrupts = <25>; - #dma-channels = <16>; #dma-cells = <2>; + /* For backwards compatibility: */ + #dma-channels = <16>; + dma-channels = <16>; #dma-requests = <40>; + dma-requests = <40>; status = "okay"; }; diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi index ccbecad9c5c7..a2cbfb3be609 100644 --- a/arch/arm/boot/dts/pxa27x.dtsi +++ b/arch/arm/boot/dts/pxa27x.dtsi @@ -12,9 +12,12 @@ pdma: dma-controller@40000000 { compatible = "marvell,pdma-1.0"; reg = <0x40000000 0x10000>; interrupts = <25>; - #dma-channels = <32>; #dma-cells = <2>; + /* For backwards compatibility: */ + #dma-channels = <32>; + dma-channels = <32>; #dma-requests = <75>; + dma-requests = <75>; status = "okay"; }; diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi index d19674812cd2..f9c216f91865 100644 --- a/arch/arm/boot/dts/pxa3xx.dtsi +++ b/arch/arm/boot/dts/pxa3xx.dtsi @@ -122,9 +122,12 @@ pdma: dma-controller@40000000 { compatible = "marvell,pdma-1.0"; reg = <0x40000000 0x10000>; interrupts = <25>; - #dma-channels = <32>; #dma-cells = <2>; + /* For backwards compatibility: */ + #dma-channels = <32>; + dma-channels = <32>; #dma-requests = <100>; + dma-requests = <100>; status = "okay"; };