From nobody Sun May 10 17:54:57 2026 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 17AD7C4332F for ; Wed, 27 Apr 2022 16:18:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242707AbiD0QVi (ORCPT ); Wed, 27 Apr 2022 12:21:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243123AbiD0QTI (ORCPT ); Wed, 27 Apr 2022 12:19:08 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E89198AE41 for ; Wed, 27 Apr 2022 09:15:19 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id bv19so4408094ejb.6 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=5d5BOCFKxpDAetlMb7QJyuAgoZN0v2tYqiUKANvYtMsztpYMfFJL3uU3zs8jFF+Bxx uowzeU2QdgDixih1t0/LiNVw4Fvi1Ptwvfiiovl1ilNKIHlEzC6YXFWL+SJkoaNp+Hel ZFFKpoG8llv6bxc2wHXwjZsy68TM88S4gEVN4M0XCHdkf5FAROF/NDujw9k9quEbjYj3 doB59z7B0ATHjCghKQXtQwO4rI20vmxg6j4eRiAk+Zejm7IwEMY3xefWa8dXNm6oLJBC X8FAStUlpxpiQIpxnfQyIHC6SPG3Lee5aPADbxL75TchW9KKF7A8LeRMX+Ik0axHJ+la y/RA== X-Gm-Message-State: AOAM531ODsGuEAaI1fTN4MwS85/tuhcoq0a6CD6aHQtVQlY5KFrwMXm6 qs24C7g1Ram7+PuiFxgw1uT90A== 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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/Documentat= ion/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 =20 Optional properties: -- #dma-channels: Number of DMA channels supported by the controller (defau= lts +- dma-channels: Number of DMA channels supported by the controller (defaul= ts 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 =20 "marvell,pdma-1.0" Used platforms: pxa25x, pxa27x, pxa3xx, pxa93x, pxa168, pxa910, pxa688. @@ -33,7 +35,7 @@ pdma: dma-controller@d4000000 { reg =3D <0xd4000000 0x10000>; interrupts =3D <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15>; interrupt-parent =3D <&intcmux32>; - #dma-channels =3D <16>; + dma-channels =3D <16>; }; =20 /* @@ -45,7 +47,7 @@ pdma: dma-controller@d4000000 { compatible =3D "marvell,pdma-1.0"; reg =3D <0xd4000000 0x10000>; interrupts =3D <47>; - #dma-channels =3D <16>; + dma-channels =3D <16>; }; =20 =20 --=20 2.32.0 From nobody Sun May 10 17:54:57 2026 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 CBC80C433F5 for ; Wed, 27 Apr 2022 16:18:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242850AbiD0QVq (ORCPT ); Wed, 27 Apr 2022 12:21:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243161AbiD0QTL (ORCPT ); Wed, 27 Apr 2022 12:19:11 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E86DD88789 for ; Wed, 27 Apr 2022 09:15:23 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id d6so2523507ede.8 for ; Wed, 27 Apr 2022 09:15:23 -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=Sz4tOxjimooQ/y2MNE2HpETaGZ03QicWobGQe/ITHnZ3i/1W2t+c/755K7EH17gloK bY+KHXSb61ehCjCEQAjtU23oQlT5M7ZLZCJXjQuXuNu4SFNOpgVAqj1PMFQcSlrYGfPv UXqsEU81sK7pzo7y+QCw1E/6HFMjZPMSPCUMuUocLAJhiYcAycxGlYtnuVRYREjtBJbK 79LcH9MAY05QKuoyE//xj1FKc0MQE6p6K7V++d5ZdewAiVjJRLFtrZXxOc8KjYWUlCEO fRuH2sVaO5zh2YjfeH/wPmI9dQvNoFx7/EwDahsq9aHKNhm8w9WNXrTM4RH0bO3FmUkN BAYA== X-Gm-Message-State: AOAM530kuxW+W8OSnVPpdHeGne6tPrGchB9sqsjJW1lEtWP/GEgHaHjV dhTg35Zxd1UVN2Z7eBSdzvvt2g== 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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) =20 of_id =3D of_match_device(pxad_dt_ids, &op->dev); if (of_id) { - of_property_read_u32(op->dev.of_node, "#dma-channels", - &dma_channels); - ret =3D 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 =3D of_property_read_u32(op->dev.of_node, "dma-requests", &nb_requestors); + if (ret) + ret =3D 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", --=20 2.32.0 From nobody Sun May 10 17:54:57 2026 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 08ED8C433EF for ; Wed, 27 Apr 2022 16:18:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242745AbiD0QVm (ORCPT ); Wed, 27 Apr 2022 12:21:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243163AbiD0QTL (ORCPT ); Wed, 27 Apr 2022 12:19:11 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01F0920BEFE for ; Wed, 27 Apr 2022 09:15:27 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id y3so4369805ejo.12 for ; Wed, 27 Apr 2022 09:15:27 -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=TWzIodXrzU4pV9ocM4/eq9tQjdJ9WNRo/xLe5zPSBNYIMuyum2zwa6Ink6nfCHmpEd K2IkNh6rjoXxoy3Pz7DWsygvxwVNM+Vl0kKQIlKxzDJ+VWo3PrCfvwPgS6BSbmW9iLvy 85Gk9lZePYOVshMwvOkriBqQOsUTh+x6cj1pMR/fE3OWehi5aAF2tmiVWb716bV4g4Ks 1XdvpuCgLuWdik76Aiciqgf2oW46P/T130fWdtReotDIqtFzscdebzo07tZKQxhtBmRn QIAlGDqAV8HflYXeKvCOGBaCqlvqYx4zUm2Leq1ZC3d9k6KSDP+6ThrtJMO9VqhvSywL h+EA== X-Gm-Message-State: AOAM533EsAXg57twEl0vXp1S4362Ja95B9MpAKrq1ZpVkDKsrDJsOdc2 EeCt8lVIFKKUsE4Y5X3wDplN8A== 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 *o= p) return PTR_ERR(pdev->base); =20 of_id =3D 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 =3D pdata->dma_channels; - else + } else { dma_channels =3D 32; /* default 32 channel */ + } pdev->dma_channels =3D dma_channels; =20 for (i =3D 0; i < dma_channels; i++) { --=20 2.32.0 From nobody Sun May 10 17:54:57 2026 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 D9157C433EF for ; Wed, 27 Apr 2022 16:18:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242547AbiD0QVx (ORCPT ); Wed, 27 Apr 2022 12:21:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243200AbiD0QTL (ORCPT ); Wed, 27 Apr 2022 12:19:11 -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 DB4A8219D20 for ; Wed, 27 Apr 2022 09:15:37 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id i27so4389608ejd.9 for ; Wed, 27 Apr 2022 09:15:37 -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=o8F79cB2KhfR3zVIXI0zl/JwxUwbQXln0SeOB1CF3MNe+Sh8brwSwEymfpbAC0CMD/ j1jVvxv7W6OYVrwGZqWOJRzH6OJ5MB2AvLoO8i4MTZmSX06yZ6T7lcZH1AtROoKQB7Yc IX3bfVA9G9wUmdwD+O962BHp12lrSga4dWpado5ker2yuHtRIFX663RJafvYQ9HJ+aIe IfvF1tShUqpT+aQyt8uVirzuicx+cNKh9f1iyOWOUecashpQPb1/TnDyqqi4e8ZgRb5G PSrViPWXczakW4Y0KgnGuQOaPM9Nf1rVYbvsTxndaqLN3LoHDkCEmN46cqDtk895+1CY dPjQ== X-Gm-Message-State: AOAM530pzoNWqIFK9UsJB0bpgA6+o3Zu1APnec6M2TasHGpEs4wKtkQD nPL1f2B36pBxbWKDjLTRHTyg4Q== 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 =3D "marvell,pdma-1.0"; reg =3D <0xd4000000 0x10000>; interrupts =3D <48>; - #dma-channels =3D <16>; + dma-channels =3D <16>; status =3D "disabled"; }; =20 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 =3D "marvell,pdma-1.0"; reg =3D <0x40000000 0x10000>; interrupts =3D <25>; - #dma-channels =3D <16>; #dma-cells =3D <2>; - #dma-requests =3D <40>; + dma-channels =3D <16>; + dma-requests =3D <40>; status =3D "okay"; }; =20 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 =3D "marvell,pdma-1.0"; reg =3D <0x40000000 0x10000>; interrupts =3D <25>; - #dma-channels =3D <32>; #dma-cells =3D <2>; - #dma-requests =3D <75>; + dma-channels =3D <32>; + dma-requests =3D <75>; status =3D "okay"; }; =20 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 =3D "marvell,pdma-1.0"; reg =3D <0x40000000 0x10000>; interrupts =3D <25>; - #dma-channels =3D <32>; #dma-cells =3D <2>; - #dma-requests =3D <100>; + dma-channels =3D <32>; + dma-requests =3D <100>; status =3D "okay"; }; =20 --=20 2.32.0