[PATCH 3/3] arm64: dts: imx8mn: Swap SAI DMA order

Marek Vasut marex at denx.de
Thu Nov 3 11:19:20 PDT 2022


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 <marex at denx.de>
---
Cc: Adam Ford <aford173 at gmail.com>
Cc: Alexander Stein <alexander.stein at ew.tq-group.com>
Cc: Fabio Estevam <festevam at gmail.com>
Cc: Joakim Zhang <qiangqing.zhang at nxp.com>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt at linaro.org>
Cc: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Cc: Lucas Stach <l.stach at pengutronix.de>
Cc: Marek Vasut <marex at denx.de>
Cc: Markus Niebel <Markus.Niebel at ew.tq-group.com>
Cc: NXP Linux Team <linux-imx at nxp.com>
Cc: Paul Elder <paul.elder at ideasonboard.com>
Cc: Peng Fan <peng.fan at nxp.com>
Cc: Pengutronix Kernel Team <kernel at pengutronix.de>
Cc: Richard Zhu <hongxing.zhu at nxp.com>
Cc: Rob Herring <robh+dt at kernel.org>
Cc: Sascha Hauer <s.hauer at pengutronix.de>
Cc: Shawn Guo <shawnguo at kernel.org>
Cc: Tim Harvey <tharvey at gateworks.com>
Cc: devicetree at vger.kernel.org
To: linux-arm-kernel at 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 at 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 at 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 at 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 at 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 at 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";
 				};
 
-- 
2.35.1




More information about the linux-arm-kernel mailing list