From patchwork Tue May 3 06:51:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 569281 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 545D5C4332F for ; Tue, 3 May 2022 06:53:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230425AbiECG5N (ORCPT ); Tue, 3 May 2022 02:57:13 -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 S230405AbiECG4N (ORCPT ); Tue, 3 May 2022 02:56:13 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7845C19C01 for ; Mon, 2 May 2022 23:52:08 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id p18so18813897edr.7 for ; Mon, 02 May 2022 23:52:08 -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=sVwYpRv6A4+S1bhstcYmZjP3ooQB2ceztq/bgoKx4Y0=; b=m+UMq9HjFGL1pawSHWXNJXY44LbxRl3b3jZvFdOr24LdN7cVAsl0Yc71DBJ/7+Errp SnNqwB6EnkY9DVlJXEW2Xv4nWFaVNGVJ0vTRZj3aMNR6UgDW1CPJKmEUG95memNdbie1 v06aoP4J842g6uQ+MwMldH5MnXWRA5K88BqSPnV8fXbKGcyps6jxcJSoHGDQ1GmbbPUy bNjktXdRRKrdZWa6sINABtOr2Vu3rNQiwCgn2G36ZgNY5awGpYOY2IiMCGYKkQdXLBE1 HXoYaNb2ZSUtqBpX8+pUHe4G4am33WQOfTMXcxwZeJF+sslF2nrSE1AWzoj44Mrxv85X xjlQ== 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=sVwYpRv6A4+S1bhstcYmZjP3ooQB2ceztq/bgoKx4Y0=; b=FWrsa/nKZEJqr7cKX5iTThpVMm54+WtL07xZAm23ePO3BKlZunwipk3ZBNHj2UzUK1 XyJVzFUeuzwNH8DQjz0kAj2JA3iJlfgrwv1K3fA+6FqCMfDJekR/yek4CAkjotH3UHzt FJXEw1p6E4gWFP0Pmb/TsGZyb3MmyjGqZqPW5Iy7mz/BFABa4KYpYtwaHgPCXVNG5PKV fUaRvQboP1n/gfz5KUoP8HCaPec1uBAMYEwKUyzanUD65pTTaJResDqJuaOgp8FgCrvY QwSgiihRgQ6kvYcFN3f79fqKIKniFO8RsdGBeJCw5XVHjFUVC3IL8qBBDqU9si/lbYk+ no0Q== X-Gm-Message-State: AOAM531w4UFkKBIAHLTvyFKV4DLystr0+kzofDHH6zDXxnmdLC3TARSE 7IK8W2vyJjKyIVa9PIFGOZxeAw== X-Google-Smtp-Source: ABdhPJxX41ad42ohDONU2inC36SvNn3yJ8FVybQJC23jj81KFEG0aHFRSNIgZA4e/OODJOxCriEyJg== X-Received: by 2002:aa7:c04e:0:b0:400:4daf:bab1 with SMTP id k14-20020aa7c04e000000b004004dafbab1mr16455194edo.101.1651560726854; Mon, 02 May 2022 23:52: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 hf27-20020a1709072c5b00b006f3ef214e2fsm4382915ejc.149.2022.05.02.23.52.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 23:52:06 -0700 (PDT) From: Krzysztof Kozlowski To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , =?utf-8?q?Beno?= =?utf-8?q?=C3=AEt_Cousson?= , Tony Lindgren , Sekhar Nori , Bartosz Golaszewski , Vinod Koul , linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org Cc: Krzysztof Kozlowski , Rob Herring Subject: [PATCH v3 1/6] dt-bindings: usb: am33xx-usb: deprecate '#dma-channels' Date: Tue, 3 May 2022 08:51:56 +0200 Message-Id: <20220503065201.51818-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220503065201.51818-1-krzysztof.kozlowski@linaro.org> References: <20220503065201.51818-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The generic property, used in most of the drivers and defined in generic dma-common DT bindings, is 'dma-channels'. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/usb/am33xx-usb.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/am33xx-usb.txt b/Documentation/devicetree/bindings/usb/am33xx-usb.txt index 7a198a30408a..654ffc62d013 100644 --- a/Documentation/devicetree/bindings/usb/am33xx-usb.txt +++ b/Documentation/devicetree/bindings/usb/am33xx-usb.txt @@ -61,8 +61,9 @@ DMA endpoint number (0 … 14 for endpoints 1 … 15 on instance 0 and 15 … 29 for endpoints 1 … 15 on instance 1). The second number is 0 for RX and 1 for TX transfers. -- #dma-channels: should be set to 30 representing the 15 endpoints for +- dma-channels: should be set to 30 representing the 15 endpoints for each USB instance. +- #dma-channels: deprecated Example: ~~~~~~~~ @@ -193,7 +194,7 @@ usb: usb@47400000 { interrupts = <17>; interrupt-names = "glue"; #dma-cells = <2>; - #dma-channels = <30>; - #dma-requests = <256>; + dma-channels = <30>; + dma-requests = <256>; }; }; From patchwork Tue May 3 06:51: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: 569282 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 00DF2C433EF for ; Tue, 3 May 2022 06:53:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231128AbiECG5B (ORCPT ); Tue, 3 May 2022 02:57:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230466AbiECG43 (ORCPT ); Tue, 3 May 2022 02:56:29 -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 A7BF81A394 for ; Mon, 2 May 2022 23:52:12 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id p4so18903360edx.0 for ; Mon, 02 May 2022 23:52:12 -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=u61yPu9p/YKGWVl2XMy7UEGngVuz5P2bHwgLF3BABl0=; b=ZRXcv6YSmEvRmCVFJwfEr6fleKYTm2R1OONnZYRwhEMLP9vNMY2nIhZlHZ2BA9SjE1 MZ/TpYXpI8JWbhZTtk5qva6Y0jkaE1SdrLm/GEQTeEXu7n8rREQn5AZzavTJVWbvLhS7 YP1bsdoJsKhsP75u33rDf+ZVr2pWtINPoe+1ooHVVfBO9OS4tWhP18A21hwKyUS+5t+P CT98xRBbgwK16T0RMVt1PDtB5xonMkdYyrJFbvg/fJedIfYvCvICWND/trR+I4ixdIQy l4sh7NbVOihryTMiY9qBhUFUnwBM6yQO9DPmQXaSEfq1gxkuDnHxyZ/TnhwPkFSPaMIJ Uv5Q== 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=u61yPu9p/YKGWVl2XMy7UEGngVuz5P2bHwgLF3BABl0=; b=SAnO1a7oTbbnojwzW/QSX4YVqx/8I9bydPYmtaNinJbOU2jwfUq97TcRjj5FBfLoYR hRuovzup+QXv7yFX240hle+MCCZjsAMZS2oChh0/tuMt/3KDnotgwZ0uPgPyuIMORI6U QB/Y1tt6WtfO83pSnHRuQbQz3VFpAcO1GTaQfb5uAtYodoRsyhRMEqQrgJ7t1hMP05QC hZL7HuPJF7SZw6ukBIE9EQSVULHdbfidxpWpbrGQ0LEk5bF1TPzkqRxxhwtgdk2bNoQZ vL3U7xHgL8uW2+8OLJlJDuNbjyjnolahlrl76FvJB//t6Ogf960RCSvvLM2bncxoDsJt i7Ow== X-Gm-Message-State: AOAM533iuJUiGRh01vDgEINjB7jme9FS+4AsXhklkQb9vDezWrjN6XFK U8+06usClMQu6XL2vurZB/3b5w== X-Google-Smtp-Source: ABdhPJzr8EYgv5A8SheIp2cUb2kVt9iDDZlxcitkaL/fJe4IIiGKBPncMBgEN2y4lFu9VSbLHbqbiQ== X-Received: by 2002:a05:6402:50a:b0:426:16c3:4283 with SMTP id m10-20020a056402050a00b0042616c34283mr16722700edv.371.1651560731133; Mon, 02 May 2022 23:52: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 hf27-20020a1709072c5b00b006f3ef214e2fsm4382915ejc.149.2022.05.02.23.52.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 23:52:10 -0700 (PDT) From: Krzysztof Kozlowski To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , =?utf-8?q?Beno?= =?utf-8?q?=C3=AEt_Cousson?= , Tony Lindgren , Sekhar Nori , Bartosz Golaszewski , Vinod Koul , linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v3 4/6] ARM: dts: am33xx: use new 'dma-channels/requests' properties Date: Tue, 3 May 2022 08:51:59 +0200 Message-Id: <20220503065201.51818-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220503065201.51818-1-krzysztof.kozlowski@linaro.org> References: <20220503065201.51818-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@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/am33xx.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index f6ec85d58dd1..9a8698bd2852 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -461,8 +461,11 @@ cppi41dma: dma-controller@2000 { interrupts = <17>; interrupt-names = "glue"; #dma-cells = <2>; + /* For backwards compatibility: */ #dma-channels = <30>; + dma-channels = <30>; #dma-requests = <256>; + dma-requests = <256>; }; }; From patchwork Tue May 3 06:52:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 569283 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 46F5EC4332F for ; Tue, 3 May 2022 06:53:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230516AbiECG4w (ORCPT ); Tue, 3 May 2022 02:56:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230260AbiECG43 (ORCPT ); Tue, 3 May 2022 02:56:29 -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 265051A81C for ; Mon, 2 May 2022 23:52:14 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id m20so31611579ejj.10 for ; Mon, 02 May 2022 23:52: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=ZIGxwKJ/Xe8wH7s0ybpa7g9C2aeLAWID2un0fZf5uMo=; b=qj15gElKMaakF51ZR6R/CMfWiS7bMRdDHn53Xm88wnJrmDD++GYBIPmydqnNRA5sD5 6+q6gyCxnIfGShTyNjNrNj5Ds8tSDvl1G7xzFO8Sa9NeFCavVvpy1806aXw2URxPPB61 EHJ4V0FdhSvjd2FnxDJ9ogUmjEcnBE23UEoq8IM34cNjyuZ9xu2DjapPKyfEgCiZwqqh PvpBCdJmD8sYo8DFsFXoh/T0/buwS41KxpGKKSlow6gzLIOizZUa14Vd/YJXk+qzdxgB E3MC/F13GmWYzBtkP+mDt13rlyMnx/QUtrOlg86EOuYEEme2flVtNf20kKYomzlh3XbY HROg== 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=ZIGxwKJ/Xe8wH7s0ybpa7g9C2aeLAWID2un0fZf5uMo=; b=Bo3WPV99pMANmNyhGINQ5bNy4xdOxZLbYfjlloCnwDmQRqzN19pVwXm6PVp8nXxKL9 uxhwnBsIhFniECy6As8vRqVI485WxGhO95MwKQuT2fJL7Nf5QfUL3SM8H802+oKDUhp8 qKDisibnAR1RSXIZu5KavGt7l2PA+1iG/B7EXPUFrwpwEpKkmxFsmU3gVHDCqETL0k2m GZcJ4Scn/Ox/146GB7sUUSKgqXb5FZdDwAc0KfDrLu1ryPNfvVka3oFI7zFCbY+wc0/A UdBAwpaQQ8TnWdEw6UKRIHcN7d4QAvHGNo3oucX4lHx0Veu/s5XwSdT7z+TmFyZPliLg dcNQ== X-Gm-Message-State: AOAM531Z/3/3FMTvcGQfOMt7LkTJ0+UEOl8MIBuLOLxwVAcUwjFe2lhz H02k7qQc3cech5cme58lBvy3IA== X-Google-Smtp-Source: ABdhPJx3GV6N9roneIKzcY/dVCXCn9yS7etjaOFVuf7IhAKvkRpb5Z/aaFPh+B4A4fuSZ7UHH9cApw== X-Received: by 2002:a17:906:9749:b0:6ef:bc52:1f94 with SMTP id o9-20020a170906974900b006efbc521f94mr14192498ejy.666.1651560732570; Mon, 02 May 2022 23:52:12 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id hf27-20020a1709072c5b00b006f3ef214e2fsm4382915ejc.149.2022.05.02.23.52.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 23:52:11 -0700 (PDT) From: Krzysztof Kozlowski To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , =?utf-8?q?Beno?= =?utf-8?q?=C3=AEt_Cousson?= , Tony Lindgren , Sekhar Nori , Bartosz Golaszewski , Vinod Koul , linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v3 5/6] ARM: dts: da850: use new 'dma-channels' property Date: Tue, 3 May 2022 08:52:00 +0200 Message-Id: <20220503065201.51818-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220503065201.51818-1-krzysztof.kozlowski@linaro.org> References: <20220503065201.51818-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The '#dma-channels' property was deprecated in favor of one defined by generic dma-common DT bindings. Add new property while keeping old one for backwards compatibility. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/da850.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index c3942b4e82ad..0386376fa486 100644 --- a/arch/arm/boot/dts/da850.dtsi +++ b/arch/arm/boot/dts/da850.dtsi @@ -679,7 +679,9 @@ cppi41dma: dma-controller@201000 { "scheduler", "queuemgr"; interrupts = <58>; #dma-cells = <2>; + /* For backwards compatibility: */ #dma-channels = <4>; + dma-channels = <4>; power-domains = <&psc1 1>; status = "okay"; };