From patchwork Sun Jun 4 12:12:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 689611 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 8596AC87FDD for ; Sun, 4 Jun 2023 12:13:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231727AbjFDMN1 (ORCPT ); Sun, 4 Jun 2023 08:13:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231748AbjFDMNZ (ORCPT ); Sun, 4 Jun 2023 08:13:25 -0400 Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AE1CE0; Sun, 4 Jun 2023 05:13:22 -0700 (PDT) Received: from stefanw-SCHENKER ([37.4.248.58]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MY6P5-1pXpGD14MX-00YRQM; Sun, 04 Jun 2023 14:12:44 +0200 From: Stefan Wahren To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Ray Jui , Scott Branden , Jassi Brar , Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , "Rafael J. Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-mmc@vger.kernel.org, linux-pwm@vger.kernel.org, linux-pm@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Stefan Wahren Subject: [PATCH 04/10] ARM: dts: bcm2835: adjust DMA nodes Date: Sun, 4 Jun 2023 14:12:17 +0200 Message-Id: <20230604121223.9625-5-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230604121223.9625-1-stefan.wahren@i2se.com> References: <20230604121223.9625-1-stefan.wahren@i2se.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:MlCIRO9pga208xxruv+F0H86jIzbBCoc9x+fOZ2eGZ2WniNufy7 192tUzznPMa6Hhsu0FfCQMa3h6BTG0u62e8mkasHZcTrJWYG63mAhQwoOjmLAGORe7HyeaK wIa31cUeHV/9IKX3o8Cr8yT35ZJI486R3/+Cx69A0ytMonG90cvHbESnCpTfpEAE05tHNMi BpdDJ6ftElBO/E02n3fXQ== UI-OutboundReport: notjunk:1;M01:P0:O+MH+gDO2dY=;z0hesc/5QyYxSW+vBB08V6bSOfC JqNpomBhLzTp/JbbmCpzvFIvnHRH2KfsvWDdegB1lC6gjatYyi+EgZuSi636cCMnlkkht0QNy Zgre4pa7j+4yhUe1eZuZJt+JOa+jXnjI27+wG/vK19YXcC5C6HzAGlLapN1kZs6DOYFIvhGtN N6KYe9/nlLN53DzNCyTih9AuGJbwevI4nfE0kfM5Zoh3n8SKHs2xis3HJ26trEpSQ4ftSiw/K OE7wJ3GSE8by6+vmM3XAi5Hjm08mMyrVe8bXr/YLifs4MIu0DRj3ObmNzeNFqBHSHFeE1c8hu bwayWRJoYmtRNT9bjeuIowRCDFeCJzyeYf1T//OKF4cUTUILGopEjj3Fe4+GbkumQdy/a/aV8 FL9Gw42jPVRNq/E5lzIsupvlEDomoaXdDbtavKk97mww1pqOPWPbrJxbUKXAaBh30H01x24bR 3Q4M3UDjskcGSfvJ9w2S41L+zqm22Oghfg+XVllzuyIqV7OLsb3uN2U1yUx4ECuiclezmz5kq T0nDsIefWnvzlr08Mh4nHQvQ3ukvnslBDeNYy8S0IT21o/3wrc4a6uvE/ctFFD9NH3t8jUQcp ffd5CACOSwcbqGo9urmVMzSzMvFkKjzszXlQvuusgzjivWgwPexdaD2N0VF3tk6dDkhwvh82q Ko4LGNBOb1xZHR28TChK3on5F01WzLO3tdeaqyiA3w== Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org After converting the bcm2835-dma DT binding to YAML, the DT schema checks gave warnings like: $nodename:0: 'dma@7e007000' does not match '^dma-controller(@.*)?$' 'dma-channel-mask' is a required property Unevaluated properties are not allowed ('brcm,dma-channel-mask' was unexpected) So fix them accordingly. Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2711.dtsi | 4 ++-- arch/arm/boot/dts/bcm2835-common.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index 097e9f252235..83745672a120 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -76,7 +76,7 @@ thermal: thermal { }; }; - dma: dma@7e007000 { + dma: dma-controller@7e007000 { compatible = "brcm,bcm2835-dma"; reg = <0x7e007000 0xb00>; interrupts = , @@ -103,7 +103,7 @@ dma: dma@7e007000 { "dma9", "dma10"; #dma-cells = <1>; - brcm,dma-channel-mask = <0x07f5>; + dma-channel-mask = <0x07f5>; }; pm: watchdog@7e100000 { diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi index bb7e8f7facaf..3ba8db8eed0f 100644 --- a/arch/arm/boot/dts/bcm2835-common.dtsi +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -8,7 +8,7 @@ / { interrupt-parent = <&intc>; soc { - dma: dma@7e007000 { + dma: dma-controller@7e007000 { compatible = "brcm,bcm2835-dma"; reg = <0x7e007000 0xf00>; interrupts = <1 16>, @@ -46,7 +46,7 @@ dma: dma@7e007000 { "dma14", "dma-shared-all"; #dma-cells = <1>; - brcm,dma-channel-mask = <0x7f35>; + dma-channel-mask = <0x7f35>; }; intc: interrupt-controller@7e00b200 {