From patchwork Wed Apr 27 16:14:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12829135 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 814C4C433F5 for ; Wed, 27 Apr 2022 16:17:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242920AbiD0QUo (ORCPT ); Wed, 27 Apr 2022 12:20:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243134AbiD0QTJ (ORCPT ); Wed, 27 Apr 2022 12:19:09 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E4701334DB for ; Wed, 27 Apr 2022 09:15:20 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id kq17so4422980ejb.4 for ; Wed, 27 Apr 2022 09:15:19 -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=HU4wSLZja0C6+OY7L9Gn0/6rVFsXV6MvUCgiU8X0lt4=; b=U69RheG92xa7VqGOMDC7qg6AyUTO0FXeQvYmNgjgNP8Gm7F25PB8QveVdq1aioQcuG a5tJrlPz3jvO2XxLu/gV+13lwrnIWqkOSnQdmVzRozei7S5QviDz3da+GqR9SvKdocld wNaGltnqNqiE/I53JQ0oYWtvzEQVlDfmGEYmxc/U1fupfjWE7yt/xl+OG/7K3nqt6+Zo Ib64T7BQRx9HbjOQKs26ddTMMvT8w5WOMboTgY3atg4yQcFhkln+5BhKH9DNre29Ed3E 7n3CqgjuzL3ALiROscoQXWE1SaNwdjCE1TrUjN/VJ+oK2wEY1UG5d0p0DfAnSXDtu46S x3jQ== 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=HU4wSLZja0C6+OY7L9Gn0/6rVFsXV6MvUCgiU8X0lt4=; b=VWypOJfHKeMGACMd6wQZENaLZN20LPxgV2T2yCDG1HQUoH7HJDxTLE1Uon0t5xn8mL GyRV+G/4z3uyvuRzAIEMSMfNyNRvXjsqLrhYB42cNJjjH1XlB/42zjPSEhpW0GIS3iWd TzSxyG9ofU//WsrAdxDdWnLjB5HMdLpRFPpbj4Gjzo0k8lbdJBDwl4S9EQP7cLvXXAH5 Hztw/31G6ickArWUJtWKJbR9oYXtPMmH9f6bvn507l0KIijalgObmGVKyHQsEwYiWCUd 0Y50MuzNkThnfFEdrtRyYvcFVA8NPUDBmsHmqu9/nvIahu1inkmDPWFtZ9MUAIrsF2EI fRZw== X-Gm-Message-State: AOAM533d5gPqO3phQkKYHxmunxivsq+MeBrAoLBRS6HbMX4qdthZT/cm qWVR/0PCIHraDoDJmzPle7SeJg== X-Google-Smtp-Source: ABdhPJyzv5+mDeZZ3e8yNOxHBsQrS70oNI4XE4sT0QrhFCwZkOTpeGwrcdlfXZIdNFScLhc7am47uw== X-Received: by 2002:a17:907:97cc:b0:6da:a8fb:d1db with SMTP id js12-20020a17090797cc00b006daa8fbd1dbmr27520451ejc.267.1651076106720; Wed, 27 Apr 2022 09:15:06 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id r19-20020a17090638d300b006d6e4fc047bsm7095015ejd.11.2022.04.27.09.15.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 09:15:06 -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 1/4] dt-bindings: dmaengine: mmp: deprecate '#dma-channels' and '#dma-requests' Date: Wed, 27 Apr 2022 18:14:56 +0200 Message-Id: <20220427161459.647676-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220427161459.647676-1-krzysztof.kozlowski@linaro.org> References: <20220427161459.647676-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 Wed Apr 27 16:14:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12829127 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 CB5F7C43219 for ; Wed, 27 Apr 2022 16:17:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242666AbiD0QUa (ORCPT ); Wed, 27 Apr 2022 12:20:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243133AbiD0QTJ (ORCPT ); Wed, 27 Apr 2022 12:19:09 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2525B203F75 for ; Wed, 27 Apr 2022 09:15:21 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id k27so2530800edk.4 for ; Wed, 27 Apr 2022 09:15:20 -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=XgQiz/DMtYoEuMdjsE5RPTiK8uFm9NKru9Ft5z31xwpOehzewXxVtyrDiqdO/DSduZ MhN6G0qCcNlQMRG/ym+te/voyNUBHC5fyMIgNxhwnRJYoMQB4TIshrl7IMjIfAEyLaiH w3PbGQlf/Zwb9CcJ8zhiQtf9/TlJ7tawPpx/34AtNuZTe9DOaS7p+17ysDNTMdHKWnK6 R0fl2lTkBlILADHx+IJOaqq0MsbXQb+PHBXR0eSNs0NUiifAacUi+QqP6EWJ76vXT3Al 3BJlbFz19P+xLgneNgOW3oVmglAXptQNVqKNZu100r0K64jeiobaEYfaHL9471K2t5Hx bJAg== 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=a1u5g4aqL6UeGIpOA4va072G/VtVLYVbLidyUEoR3ayCz+K+Lgmm9iSX+OSenGXDMC ujGVEyZ2Ug0IQJ3qsuPrKID/kClRicTpVSp0eprzEty5utbqQOqaLsLUqPnfmwD8hgKt UwBXXCzzyigiZ37ZvPAl8uL1uSVZUEnrajDalAVIe4pRI/2kJI7FJv8kKhM6OzE+JXKj wT0pCA0MikBl4lZe3A+SsG3vdZmNuTcqYoFOTLrjxx7dd2RRL+TaOMjf8F34QRQY8ZES T6I0HoXkSFcBg3kb3jFGRN4bU/5JZh+qPx3mEv1omny2T+WBLxiBXw4E62bZY/HyXEnI F9jg== X-Gm-Message-State: AOAM530aAu4TVImuWj70hbcMqBRLL2kVj/8jWlncgWl2T/Dez/tw7o9I JLrhSX0BS72Kfyzaxa3f1BdWIg== X-Google-Smtp-Source: ABdhPJwHfDDPN11PYsb9j7rKqQqQGw0/VEFXbbHLx6w0PzuY3ZIqjllPexQhruoKLhJahwnycQh0kA== X-Received: by 2002:a05:6402:11c9:b0:425:ef56:a1dd with SMTP id j9-20020a05640211c900b00425ef56a1ddmr15339331edw.143.1651076107787; Wed, 27 Apr 2022 09:15:07 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id r19-20020a17090638d300b006d6e4fc047bsm7095015ejd.11.2022.04.27.09.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 09:15:07 -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 2/4] dmaengine: pxa: deprecate '#dma-channels' and '#dma-requests' Date: Wed, 27 Apr 2022 18:14:57 +0200 Message-Id: <20220427161459.647676-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220427161459.647676-1-krzysztof.kozlowski@linaro.org> References: <20220427161459.647676-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 Wed Apr 27 16:14:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12829132 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 563E0C4167D for ; Wed, 27 Apr 2022 16:17:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242820AbiD0QUj (ORCPT ); Wed, 27 Apr 2022 12:20:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243136AbiD0QTJ (ORCPT ); Wed, 27 Apr 2022 12:19:09 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B328416D2D7 for ; Wed, 27 Apr 2022 09:15:25 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id i19so4373169eja.11 for ; Wed, 27 Apr 2022 09:15:25 -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=xzyfNbpq+hHflDo3MaJj/kAHE+ybl9o8ISSUbD5Fa2ZSK2bbJ8RIKpAEddGKZXPzRG UqI5MgJsvM6QatLFtzI3mQ9rexXKTqB7F465Xcpa8OvKR3BPPV2xgyUETPWVsGrf8fL2 9HTcp0od11LRmBP/ufdC9icymTSdHzbN42lEvsT4VPwL9+DVI3FQh7w00vD1X6XkFswz mlSM4MYdRpMM5TPNee19PPhgOX2zONnVlgpmaSgSkPoUupmbEnDFFkoR77AoQjnuwGF+ t+Yoy2bbZfUBdPyskCEuU9btMFR4KlNCvlZ69+sJ9wnTibYnjtQ+1prOciMfgZD7wGRk zFZQ== 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=bdRAPhw0e/xavDinyI/wwmQnA+R+fCdFTxbcKSnCgnxF0qlmnzQmuGjn4jD1foLdPG kjB5angzoGRKbheY9CNO0K6OYkku6k/fw77ew9C/cu9sGAo2eKT8JunzCnwGlEo1KEd1 ZZVpVaMMYgMfv6dqWa6MWf5A3rBUVzWi6Yr2rE6M/HVMFgoEhz1cH0F+4WnLd+eb0K1a D4Y1NBRzznlrIEySfF/u4FcBBG+8ISnaATaQkJFznSJpLhqRt+dPPhwG2+klxuDlDjjb BJw2tPkdyeENX1G6EwSc1QuvpQYPQntZSxZNvVAjmN+ifeIKpaDIShlK57kwTBuZpgI4 E+pA== X-Gm-Message-State: AOAM532UEIDT+X6HiIa0rOmL8IYHMQaMGIgBpMTQQVjSkNpJ2ss5nd8Z +nBYmTrr9f++D5bvDYSq+4HbAA== X-Google-Smtp-Source: ABdhPJyt6dL7KsOnoNV738RSDvZ+369FsP757XFQzna9ghSby6yVScpmNROztRmHDMGufy94p5G74w== X-Received: by 2002:a17:907:2d21:b0:6f3:bbd6:5a09 with SMTP id gs33-20020a1709072d2100b006f3bbd65a09mr7051601ejc.552.1651076108792; Wed, 27 Apr 2022 09:15:08 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id r19-20020a17090638d300b006d6e4fc047bsm7095015ejd.11.2022.04.27.09.15.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 09:15:08 -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 3/4] dmaengine: mmp: deprecate '#dma-channels' Date: Wed, 27 Apr 2022 18:14:58 +0200 Message-Id: <20220427161459.647676-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220427161459.647676-1-krzysztof.kozlowski@linaro.org> References: <20220427161459.647676-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 Wed Apr 27 16:14:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12829133 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 84EC2C433FE for ; Wed, 27 Apr 2022 16:17:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242845AbiD0QUk (ORCPT ); Wed, 27 Apr 2022 12:20:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243189AbiD0QTL (ORCPT ); Wed, 27 Apr 2022 12:19: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 E5117203DEE for ; Wed, 27 Apr 2022 09:15:34 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id l7so4440087ejn.2 for ; Wed, 27 Apr 2022 09:15:34 -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=3OS/b7QEPllq3BIYgS2/Shs51nbXZ23JbFURSkhEpp8=; b=gpCYO1nGXIOSpx6PvS4uCMzNFQpwWb7Suc0nEV+AWiiAkTmcfS2NML1B+aoR+hcGXL ZKzI9H2s3nHON/G7KRLPavAoJo3eTcZIB+6OO1mfwh6dIg1hH2CvxTW52hUfuR4ilV4B fkZm+I51kFE8Fa29XS7fziDUhG6CGPiGncqDwtERYHHnpyZOwIiSVzNQLdxaXJ1Zuw8Y bifM0AhDbGTriUN8S6dhbcRJheL/FlxGRHfQvmf6929fWsfFCg2CyNNa1m72Mt+sl/gX PvrGlhTKAqJuDF2jgx+EOAKHqpY4iUal4v2gtrBO+WDp2TLcVPAZ8nq/IbfirhL1okev HRcA== 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=3OS/b7QEPllq3BIYgS2/Shs51nbXZ23JbFURSkhEpp8=; b=oilDb9jCz/Eq2+VPpWyAWjdL8LzVNO1nwZ6wHy0bmmO+yKLfDH5k4ysiFZHARaQk98 rp6S5vc1UQeg6uNs1Gvj9mmOnZMRwQu78Z40C0K9mJcXGfRSd6mIBzjiBpMLlU8AzDKp fXksjTFTA+iCYYrHNZ+YS9A4H6m+kJeZvis/4m5DG7UuLJfehJ0zTVw6db92cvBr88OZ oKKt5tI+RqYL3pn7ZntcWAFnQzq0z1oTq8d1V2bWqCwrrgTlDt1hx51y/i07328c4XLV AKnIqXcSeDeWoPFwMZY1UhSccWjWv7zs6u5x5SG/e9f19RxYSV8BEnsvZhiMu1pmImuQ GfJg== X-Gm-Message-State: AOAM5323v4LHM2qq+ueQuJfbrNdrUg4fgXaoBudEpP9gx2kcuB5Mf7Bl wPPPj1j+z3NujsRlSglnCMDp/w== X-Google-Smtp-Source: ABdhPJxiXIehiQaBDpfXJpnDBoW5bJylGl7VO6kcxOhn9/c1Lz5IZ4VA7YXIH1dAzDS613Am43Wu+g== X-Received: by 2002:a17:907:4c8:b0:6f3:beac:260c with SMTP id vz8-20020a17090704c800b006f3beac260cmr5814886ejb.321.1651076110315; Wed, 27 Apr 2022 09:15:10 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id r19-20020a17090638d300b006d6e4fc047bsm7095015ejd.11.2022.04.27.09.15.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 09:15:09 -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 4/4] ARM: dts: pxa: use new 'dma-channels/requests' properties Date: Wed, 27 Apr 2022 18:14:59 +0200 Message-Id: <20220427161459.647676-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220427161459.647676-1-krzysztof.kozlowski@linaro.org> References: <20220427161459.647676-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. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/mmp2.dtsi | 2 +- arch/arm/boot/dts/pxa25x.dtsi | 4 ++-- arch/arm/boot/dts/pxa27x.dtsi | 4 ++-- arch/arm/boot/dts/pxa3xx.dtsi | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi index 46984d4c5224..1a49b58e8048 100644 --- a/arch/arm/boot/dts/mmp2.dtsi +++ b/arch/arm/boot/dts/mmp2.dtsi @@ -275,7 +275,7 @@ dma-controller@d4000000 { compatible = "marvell,pdma-1.0"; reg = <0xd4000000 0x10000>; interrupts = <48>; - #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..0d2d09cad059 100644 --- a/arch/arm/boot/dts/pxa25x.dtsi +++ b/arch/arm/boot/dts/pxa25x.dtsi @@ -38,9 +38,9 @@ pdma: dma-controller@40000000 { compatible = "marvell,pdma-1.0"; reg = <0x40000000 0x10000>; interrupts = <25>; - #dma-channels = <16>; #dma-cells = <2>; - #dma-requests = <40>; + dma-channels = <16>; + dma-requests = <40>; status = "okay"; }; diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi index ccbecad9c5c7..68b940fabe5f 100644 --- a/arch/arm/boot/dts/pxa27x.dtsi +++ b/arch/arm/boot/dts/pxa27x.dtsi @@ -12,9 +12,9 @@ pdma: dma-controller@40000000 { compatible = "marvell,pdma-1.0"; reg = <0x40000000 0x10000>; interrupts = <25>; - #dma-channels = <32>; #dma-cells = <2>; - #dma-requests = <75>; + dma-channels = <32>; + dma-requests = <75>; status = "okay"; }; diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi index d19674812cd2..f1fa7f54a398 100644 --- a/arch/arm/boot/dts/pxa3xx.dtsi +++ b/arch/arm/boot/dts/pxa3xx.dtsi @@ -122,9 +122,9 @@ pdma: dma-controller@40000000 { compatible = "marvell,pdma-1.0"; reg = <0x40000000 0x10000>; interrupts = <25>; - #dma-channels = <32>; #dma-cells = <2>; - #dma-requests = <100>; + dma-channels = <32>; + dma-requests = <100>; status = "okay"; };