Commit a4b7c361 authored by Cristian Ciocaltea's avatar Cristian Ciocaltea Committed by Greg Kroah-Hartman
Browse files

ARM: dts: sun6i: a31: Switch dma-names order for snps,dw-apb-uart nodes 



Commit 370f696e ("dt-bindings: serial: snps-dw-apb-uart: add dma &
dma-names properties") documented dma-names property to handle Allwinner
D1 dtbs_check warnings, but relies on the rx->tx ordering, which is the
reverse of what a bunch of different boards expect.

The initial proposed solution was to allow a flexible dma-names order in
the binding, due to potential ABI breakage concerns after fixing the DTS
files. But luckily the Allwinner boards are not affected, since they are
using a shared DMA channel for rx and tx.

Hence, the first step in fixing the inconsistency was to change
dma-names order in the binding to tx->rx.

Do the same for the snps,dw-apb-uart nodes in the DTS file.

Signed-off-by: default avatarCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Link: https://lore.kernel.org/r/20230321215624.78383-3-cristian.ciocaltea@collabora.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec956e2c

arch/arm/boot/dts/sun6i-a31.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ 
			clocks = <&ccu CLK_APB2_UART0>;

			resets = <&ccu RST_APB2_UART0>;

			dmas = <&dma 6>, <&dma 6>;

			dma-names = "rx", "tx";

			dma-names = "tx", "rx";

			status = "disabled";

		};
@@ -835,7 +835,7 @@ 
			clocks = <&ccu CLK_APB2_UART1>;

			resets = <&ccu RST_APB2_UART1>;

			dmas = <&dma 7>, <&dma 7>;

			dma-names = "rx", "tx";

			dma-names = "tx", "rx";

			status = "disabled";

		};
@@ -848,7 +848,7 @@ 
			clocks = <&ccu CLK_APB2_UART2>;

			resets = <&ccu RST_APB2_UART2>;

			dmas = <&dma 8>, <&dma 8>;

			dma-names = "rx", "tx";

			dma-names = "tx", "rx";

			status = "disabled";

		};
@@ -861,7 +861,7 @@ 
			clocks = <&ccu CLK_APB2_UART3>;

			resets = <&ccu RST_APB2_UART3>;

			dmas = <&dma 9>, <&dma 9>;

			dma-names = "rx", "tx";

			dma-names = "tx", "rx";

			status = "disabled";

		};
@@ -874,7 +874,7 @@ 
			clocks = <&ccu CLK_APB2_UART4>;

			resets = <&ccu RST_APB2_UART4>;

			dmas = <&dma 10>, <&dma 10>;

			dma-names = "rx", "tx";

			dma-names = "tx", "rx";

			status = "disabled";

		};
@@ -887,7 +887,7 @@ 
			clocks = <&ccu CLK_APB2_UART5>;

			resets = <&ccu RST_APB2_UART5>;

			dmas = <&dma 22>, <&dma 22>;

			dma-names = "rx", "tx";

			dma-names = "tx", "rx";

			status = "disabled";

		};