Skip to content

Commit 1532d4f

Browse files
cristiccjernejsk
authored andcommitted
ARM: dts: sun8i: v3s: Switch dma-names order for snps,dw-apb-uart nodes
Commit 370f696 ("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: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> Link: https://lore.kernel.org/r/20230321215624.78383-5-cristian.ciocaltea@collabora.com Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
1 parent d4880d2 commit 1532d4f

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@
479479
reg-io-width = <4>;
480480
clocks = <&ccu CLK_BUS_UART0>;
481481
dmas = <&dma 6>, <&dma 6>;
482-
dma-names = "rx", "tx";
482+
dma-names = "tx", "rx";
483483
resets = <&ccu RST_BUS_UART0>;
484484
status = "disabled";
485485
};
@@ -492,7 +492,7 @@
492492
reg-io-width = <4>;
493493
clocks = <&ccu CLK_BUS_UART1>;
494494
dmas = <&dma 7>, <&dma 7>;
495-
dma-names = "rx", "tx";
495+
dma-names = "tx", "rx";
496496
resets = <&ccu RST_BUS_UART1>;
497497
status = "disabled";
498498
};
@@ -505,7 +505,7 @@
505505
reg-io-width = <4>;
506506
clocks = <&ccu CLK_BUS_UART2>;
507507
dmas = <&dma 8>, <&dma 8>;
508-
dma-names = "rx", "tx";
508+
dma-names = "tx", "rx";
509509
resets = <&ccu RST_BUS_UART2>;
510510
pinctrl-0 = <&uart2_pins>;
511511
pinctrl-names = "default";

0 commit comments

Comments
 (0)