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

ARM: dts: sun8i: a23/a33: 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-4-cristian.ciocaltea@collabora.com


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

arch/arm/boot/dts/sun8i-a23-a33.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ 
			clocks = <&ccu CLK_BUS_UART0>;

			resets = <&ccu RST_BUS_UART0>;

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

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

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

			status = "disabled";

		};
@@ -503,7 +503,7 @@ 
			clocks = <&ccu CLK_BUS_UART1>;

			resets = <&ccu RST_BUS_UART1>;

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

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

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

			status = "disabled";

		};
@@ -516,7 +516,7 @@ 
			clocks = <&ccu CLK_BUS_UART2>;

			resets = <&ccu RST_BUS_UART2>;

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

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

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

			status = "disabled";

		};
@@ -529,7 +529,7 @@ 
			clocks = <&ccu CLK_BUS_UART3>;

			resets = <&ccu RST_BUS_UART3>;

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

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

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

			status = "disabled";

		};
@@ -542,7 +542,7 @@ 
			clocks = <&ccu CLK_BUS_UART4>;

			resets = <&ccu RST_BUS_UART4>;

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

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

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

			status = "disabled";

		};