From patchwork Thu Nov 3 18:19:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 13030816 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 B22BDC4332F for ; Thu, 3 Nov 2022 18:21:00 +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=NAykccPaJvYv077snlD8OyeeZSRK7EArQr1S0GCH6dY=; b=BSaQ8N5esvKsPt 4yAA5xcSvIOEIgtzOjD4qQ+izfnaBCyTN5fAeCPFUpPpfljdoe0ZxjtCFf1u/c3Z+N4fm/w9WeRvC SRm4PxaNLpKcyIn7KPB1d8J+xcIHUB/STn17q2gynGcwETJFGQ+ioL1Z/ThAlTwKE+8oQwfOKEfb1 3jwmU+x4QGBzD9g+/T6by4lHx/3XNo0t6HjkjqMIGRyokFQH8L2d5EWPiuwNd572m0poJEXxgyjwC 9JQAfn3mCvlpzGeE9lVc95b9pIMC6H4b+1NOEtylY2w3pgDDSNPWco1i9D4CUKFty/f3cBAk59URi zJWfNgNPQ81rlVylgBLQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oqeoX-001EQ4-Bc; Thu, 03 Nov 2022 18:19:41 +0000 Received: from phobos.denx.de ([85.214.62.61]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oqeoQ-001ENO-UC for linux-arm-kernel@lists.infradead.org; Thu, 03 Nov 2022 18:19:36 +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 C431685076; 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=1667499573; bh=0taUmY72/R5c8QMl4HIAlEn4dIqhJeXD4IqGNt5Uydc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ETPD9uQXFh4P0gzRAkDHZ+ZrNw5kagV1TECT8X1yj6rZraB2Pt8ufmeV2bC4qoH4C YEBButbG2gRB3g+Opxq4kjK7hXD0cTYFz16ZbjZ0n9WWKk6OzoF8Uy3yk1UdnartXN ZYwo+BxvoN1J8thmwDidzSqBWx4U7gs5PaLx7MOcv569SLzwkuYZSrnUg8nngFYggH fM8hvP3KUQGvPFZ+aZeORgZejnFdxlUEk74pJGF+d7PrF3D2PghWeqKRXUKILXnKZs QDpd75vbUaPEyXHAiXIk5y/GyUChqXqKQOTVI2QGrpZ7E6epZ7YCtUWoVAq57pBlM7 GVJPVT2tSVmjA== 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 3/3] arm64: dts: imx8mn: Swap SAI DMA order Date: Thu, 3 Nov 2022 19:19:20 +0100 Message-Id: <20221103181920.95736-3-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_111935_398155_35DC43EB X-CRM114-Status: GOOD ( 11.74 ) 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/imx8mn.dtsi | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi index 607c97009399e..fba9f5519daa7 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi @@ -301,8 +301,8 @@ sai2: sai@30020000 { <&clk IMX8MN_CLK_SAI2_ROOT>, <&clk IMX8MN_CLK_DUMMY>, <&clk IMX8MN_CLK_DUMMY>; clock-names = "bus", "mclk0", "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"; }; @@ -315,8 +315,8 @@ sai3: sai@30030000 { <&clk IMX8MN_CLK_SAI3_ROOT>, <&clk IMX8MN_CLK_DUMMY>, <&clk IMX8MN_CLK_DUMMY>; clock-names = "bus", "mclk0", "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"; }; @@ -329,8 +329,8 @@ sai5: sai@30050000 { <&clk IMX8MN_CLK_SAI5_ROOT>, <&clk IMX8MN_CLK_DUMMY>, <&clk IMX8MN_CLK_DUMMY>; clock-names = "bus", "mclk0", "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"; fsl,shared-interrupt; fsl,dataline = <0 0xf 0xf>; status = "disabled"; @@ -345,8 +345,8 @@ sai6: sai@30060000 { <&clk IMX8MN_CLK_SAI6_ROOT>, <&clk IMX8MN_CLK_DUMMY>, <&clk IMX8MN_CLK_DUMMY>; clock-names = "bus", "mclk0", "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"; }; @@ -402,8 +402,8 @@ sai7: sai@300b0000 { <&clk IMX8MN_CLK_SAI7_ROOT>, <&clk IMX8MN_CLK_DUMMY>, <&clk IMX8MN_CLK_DUMMY>; clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3"; - dmas = <&sdma2 12 2 0>, <&sdma2 13 2 0>; - dma-names = "rx", "tx"; + dmas = <&sdma2 13 2 0>, <&sdma2 12 2 0>; + dma-names = "tx", "rx"; status = "disabled"; };