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

[Alexander Stein]

Hi Marek,

thanks for this patch.

Am Donnerstag, 3. November 2022, 19:19:18 CET schrieb Marek Vasut:
> Swap the SAI dmas and dma-names to match the order documented in
> Documentation/devicetree/bindings/sound/fsl-sai.txt

This file has been converted to Documentation/devicetree/bindings/sound/
fsl,sai.yaml in commit d563336877b2 ("ASoC: dt-bindings: fsl,sai: Convert 
format to json-schema"). In next since next-20220816.
In this schema the DMA order 'tx', 'rx' is only for fsl,vf610-sai, all other 
compatibles use 'rx', 'tx'. So this swap is not needed anymore.
Same is for imx8mm and imx8mn.
This change should have been made before schema conversion, so they would have 
been identical on all compatibles...

Best regards,
Alexander

> 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/imx8mq.dtsi | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
> b/arch/arm64/boot/dts/freescale/imx8mq.dtsi index
> c47e2d7235d3e..f00b040ca03e9 100644
> --- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
> @@ -345,8 +345,8 @@ sai1: sai at 30010000 {
>  				         <&clk IMX8MQ_CLK_SAI1_ROOT>,
>  				         <&clk IMX8MQ_CLK_DUMMY>, 
<&clk IMX8MQ_CLK_DUMMY>;
>  				clock-names = "bus", "mclk1", "mclk2", 
"mclk3";
> -				dmas = <&sdma2 8 24 0>, <&sdma1 9 24 
0>;
> -				dma-names = "rx", "tx";
> +				dmas = <&sdma1 9 24 0>, <&sdma2 8 24 
0>;
> +				dma-names = "tx", "rx";
>  				status = "disabled";
>  			};
> 
> @@ -359,8 +359,8 @@ sai6: sai at 30030000 {
>  				         <&clk IMX8MQ_CLK_SAI6_ROOT>,
>  				         <&clk IMX8MQ_CLK_DUMMY>, 
<&clk IMX8MQ_CLK_DUMMY>;
>  				clock-names = "bus", "mclk1", "mclk2", 
"mclk3";
> -				dmas = <&sdma2 4 24 0>, <&sdma2 5 24 
0>;
> -				dma-names = "rx", "tx";
> +				dmas = <&sdma2 5 24 0>, <&sdma2 4 24 
0>;
> +				dma-names = "tx", "rx";
>  				status = "disabled";
>  			};
> 
> @@ -373,8 +373,8 @@ sai5: sai at 30040000 {
>  				         <&clk IMX8MQ_CLK_SAI5_ROOT>,
>  				         <&clk IMX8MQ_CLK_DUMMY>, 
<&clk IMX8MQ_CLK_DUMMY>;
>  				clock-names = "bus", "mclk1", "mclk2", 
"mclk3";
> -				dmas = <&sdma2 2 24 0>, <&sdma2 3 24 
0>;
> -				dma-names = "rx", "tx";
> +				dmas = <&sdma2 3 24 0>, <&sdma2 2 24 
0>;
> +				dma-names = "tx", "rx";
>  				status = "disabled";
>  			};
> 
> @@ -387,8 +387,8 @@ sai4: sai at 30050000 {
>  				         <&clk IMX8MQ_CLK_SAI4_ROOT>,
>  				         <&clk IMX8MQ_CLK_DUMMY>, 
<&clk IMX8MQ_CLK_DUMMY>;
>  				clock-names = "bus", "mclk1", "mclk2", 
"mclk3";
> -				dmas = <&sdma2 0 24 0>, <&sdma2 1 24 
0>;
> -				dma-names = "rx", "tx";
> +				dmas = <&sdma2 1 24 0>, <&sdma2 0 24 
0>;
> +				dma-names = "tx", "rx";
>  				status = "disabled";
>  			};