Skip to content

Commit bb9ecbe

Browse files
cristiccjernejsk
authored andcommitted
ARM: dts: sunxi: h3/h5: 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-6-cristian.ciocaltea@collabora.com Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
1 parent 1532d4f commit bb9ecbe

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

arch/arm/boot/dts/sunxi-h3-h5.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@
710710
clocks = <&ccu CLK_BUS_UART0>;
711711
resets = <&ccu RST_BUS_UART0>;
712712
dmas = <&dma 6>, <&dma 6>;
713-
dma-names = "rx", "tx";
713+
dma-names = "tx", "rx";
714714
status = "disabled";
715715
};
716716

@@ -723,7 +723,7 @@
723723
clocks = <&ccu CLK_BUS_UART1>;
724724
resets = <&ccu RST_BUS_UART1>;
725725
dmas = <&dma 7>, <&dma 7>;
726-
dma-names = "rx", "tx";
726+
dma-names = "tx", "rx";
727727
status = "disabled";
728728
};
729729

@@ -736,7 +736,7 @@
736736
clocks = <&ccu CLK_BUS_UART2>;
737737
resets = <&ccu RST_BUS_UART2>;
738738
dmas = <&dma 8>, <&dma 8>;
739-
dma-names = "rx", "tx";
739+
dma-names = "tx", "rx";
740740
status = "disabled";
741741
};
742742

@@ -749,7 +749,7 @@
749749
clocks = <&ccu CLK_BUS_UART3>;
750750
resets = <&ccu RST_BUS_UART3>;
751751
dmas = <&dma 9>, <&dma 9>;
752-
dma-names = "rx", "tx";
752+
dma-names = "tx", "rx";
753753
status = "disabled";
754754
};
755755

0 commit comments

Comments
 (0)