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@xxxxxxx> --- Cc: Adam Ford <aford173@xxxxxxxxx> Cc: Alexander Stein <alexander.stein@xxxxxxxxxxxxxxx> Cc: Fabio Estevam <festevam@xxxxxxxxx> Cc: Joakim Zhang <qiangqing.zhang@xxxxxxx> Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@xxxxxxxxxx> Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> Cc: Lucas Stach <l.stach@xxxxxxxxxxxxxx> Cc: Marek Vasut <marex@xxxxxxx> Cc: Markus Niebel <Markus.Niebel@xxxxxxxxxxxxxxx> Cc: NXP Linux Team <linux-imx@xxxxxxx> Cc: Paul Elder <paul.elder@xxxxxxxxxxxxxxxx> Cc: Peng Fan <peng.fan@xxxxxxx> Cc: Pengutronix Kernel Team <kernel@xxxxxxxxxxxxxx> Cc: Richard Zhu <hongxing.zhu@xxxxxxx> Cc: Rob Herring <robh+dt@xxxxxxxxxx> Cc: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> Cc: Shawn Guo <shawnguo@xxxxxxxxxx> Cc: Tim Harvey <tharvey@xxxxxxxxxxxxx> Cc: devicetree@xxxxxxxxxxxxxxx To: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx --- 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"; }; -- 2.35.1