From patchwork Thu Nov 3 18:19:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 13030818 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 368C9C4332F for ; Thu, 3 Nov 2022 18:21:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dRZdIIkj/gRh3Z64H7PUjkWD6NyfyTS2V7fkZb7Y/S8=; b=q0v46tstD5V4xL E9M99B7UQalVDC+bu48BqTJSdfE1b/ZN7zcbRknjK0XbU7+RzpKNvCcciSZyekZz9/gKTV5jV3DY9 L0OJBQHkhPTItCZNF/fm1DiaeFSYwV8MVo6jJ8HQ1ucAfJJvqP9bam1AcKJCZ1c+Eq4UXlsGVBrFq hYAi6uxOmOph9mvF5q9XWpKhJ9J1gqXB8gJCJFlWp18LU1qrpl/7/k0xCQl5Qww6Ek3zD/sIgb+CI uz76cC3Dv5+JEU53g2PZ9Apbewj8MGsX6UA6X15nPWIPj/+7KQwSek2krbjTqMVfae87t2NOu/qaG 59xF1EgpjsxLIZfFMcFg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oqep9-001Ead-N0; Thu, 03 Nov 2022 18:20:20 +0000 Received: from phobos.denx.de ([2a01:238:438b:c500:173d:9f52:ddab:ee01]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oqeoT-001ENL-Fx for linux-arm-kernel@lists.infradead.org; Thu, 03 Nov 2022 18:19:41 +0000 Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 3E8D184F6E; Thu, 3 Nov 2022 19:19:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1667499572; bh=5/xChkNIjljhJg9+TOK54VTFTgYJEZvGpNPhmkJA94I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O+SDLRgWtqoP9OaTQ0vOClmwQ/RC1LDYP8I3Sn2nwuMewJBfY/6BXC+YtCH53qLDU X8ZCeSchztKofBNv7E1T4J/VlRHgsELFhlc2S7658CXwLcK//kdXGceU9kcDthpljP iyz5zXNp0P1F3BkTPolcr3/ioHAEs2/1PfyMr1JlUUi24WkiSSacQCQXSBe7SP520/ 3DG79ey9O6x+ALRtc1Rv7+1ourQqp1P+glkJkxLTyVNrtvo/3LVmmjU7KMvPRk5B2U MEzcLyWb0tzCaibZaSneDlLSVDuu2ebFi+mlL7ZQwVDYVRLtilU6SJoIBag4pQezje tp7k9c2G12Ryw== From: Marek Vasut To: linux-arm-kernel@lists.infradead.org Cc: Marek Vasut , Adam Ford , Alexander Stein , Fabio Estevam , Joakim Zhang , Krzysztof Kozlowski , Laurent Pinchart , Lucas Stach , Markus Niebel , NXP Linux Team , Paul Elder , Peng Fan , Pengutronix Kernel Team , Richard Zhu , Rob Herring , Sascha Hauer , Shawn Guo , Tim Harvey , devicetree@vger.kernel.org Subject: [PATCH 2/3] arm64: dts: imx8mm: Swap SAI DMA order Date: Thu, 3 Nov 2022 19:19:19 +0100 Message-Id: <20221103181920.95736-2-marex@denx.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221103181920.95736-1-marex@denx.de> References: <20221103181920.95736-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221103_111937_912532_00AAA8D9 X-CRM114-Status: GOOD ( 11.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Swap the SAI dmas and dma-names to match the order documented in Documentation/devicetree/bindings/sound/fsl-sai.txt using the following regex: " s@\(dma[^=]\+= \)\([^,]\+\), \([^;]\+\);@\1\3, \2; " No functional change. Signed-off-by: Marek Vasut --- Cc: Adam Ford Cc: Alexander Stein Cc: Fabio Estevam Cc: Joakim Zhang Cc: Krzysztof Kozlowski Cc: Laurent Pinchart Cc: Lucas Stach Cc: Marek Vasut Cc: Markus Niebel Cc: NXP Linux Team Cc: Paul Elder Cc: Peng Fan Cc: Pengutronix Kernel Team Cc: Richard Zhu Cc: Rob Herring Cc: Sascha Hauer Cc: Shawn Guo Cc: Tim Harvey Cc: devicetree@vger.kernel.org To: linux-arm-kernel@lists.infradead.org --- arch/arm64/boot/dts/freescale/imx8mm.dtsi | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi index 45fd7371ee7e9..40cc02c886d7b 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi @@ -321,8 +321,8 @@ sai1: sai@30010000 { <&clk IMX8MM_CLK_SAI1_ROOT>, <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; - dmas = <&sdma2 0 2 0>, <&sdma2 1 2 0>; - dma-names = "rx", "tx"; + dmas = <&sdma2 1 2 0>, <&sdma2 0 2 0>; + dma-names = "tx", "rx"; status = "disabled"; }; @@ -335,8 +335,8 @@ sai2: sai@30020000 { <&clk IMX8MM_CLK_SAI2_ROOT>, <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; - dmas = <&sdma2 2 2 0>, <&sdma2 3 2 0>; - dma-names = "rx", "tx"; + dmas = <&sdma2 3 2 0>, <&sdma2 2 2 0>; + dma-names = "tx", "rx"; status = "disabled"; }; @@ -349,8 +349,8 @@ sai3: sai@30030000 { <&clk IMX8MM_CLK_SAI3_ROOT>, <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; - dmas = <&sdma2 4 2 0>, <&sdma2 5 2 0>; - dma-names = "rx", "tx"; + dmas = <&sdma2 5 2 0>, <&sdma2 4 2 0>; + dma-names = "tx", "rx"; status = "disabled"; }; @@ -363,8 +363,8 @@ sai5: sai@30050000 { <&clk IMX8MM_CLK_SAI5_ROOT>, <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; - dmas = <&sdma2 8 2 0>, <&sdma2 9 2 0>; - dma-names = "rx", "tx"; + dmas = <&sdma2 9 2 0>, <&sdma2 8 2 0>; + dma-names = "tx", "rx"; status = "disabled"; }; @@ -377,8 +377,8 @@ sai6: sai@30060000 { <&clk IMX8MM_CLK_SAI6_ROOT>, <&clk IMX8MM_CLK_DUMMY>, <&clk IMX8MM_CLK_DUMMY>; clock-names = "bus", "mclk1", "mclk2", "mclk3"; - dmas = <&sdma2 10 2 0>, <&sdma2 11 2 0>; - dma-names = "rx", "tx"; + dmas = <&sdma2 11 2 0>, <&sdma2 10 2 0>; + dma-names = "tx", "rx"; status = "disabled"; };