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

ARM: dts: sun8i: v3s: 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-5-cristian.ciocaltea@collabora.com


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

arch/arm/boot/dts/sun8i-v3s.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ 
			reg-io-width = <4>;

			clocks = <&ccu CLK_BUS_UART0>;

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

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

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

			resets = <&ccu RST_BUS_UART0>;

			status = "disabled";

		};
@@ -492,7 +492,7 @@ 
			reg-io-width = <4>;

			clocks = <&ccu CLK_BUS_UART1>;

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

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

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

			resets = <&ccu RST_BUS_UART1>;

			status = "disabled";

		};
@@ -505,7 +505,7 @@ 
			reg-io-width = <4>;

			clocks = <&ccu CLK_BUS_UART2>;

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

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

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

			resets = <&ccu RST_BUS_UART2>;

			pinctrl-0 = <&uart2_pins>;

			pinctrl-names = "default";