Skip to content

Commit d4880d2

Browse files
cristiccjernejsk
authored andcommitted
ARM: dts: sun8i: a23/a33: 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-4-cristian.ciocaltea@collabora.com Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
1 parent a9efe94 commit d4880d2

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@
490490
clocks = <&ccu CLK_BUS_UART0>;
491491
resets = <&ccu RST_BUS_UART0>;
492492
dmas = <&dma 6>, <&dma 6>;
493-
dma-names = "rx", "tx";
493+
dma-names = "tx", "rx";
494494
status = "disabled";
495495
};
496496

@@ -503,7 +503,7 @@
503503
clocks = <&ccu CLK_BUS_UART1>;
504504
resets = <&ccu RST_BUS_UART1>;
505505
dmas = <&dma 7>, <&dma 7>;
506-
dma-names = "rx", "tx";
506+
dma-names = "tx", "rx";
507507
status = "disabled";
508508
};
509509

@@ -516,7 +516,7 @@
516516
clocks = <&ccu CLK_BUS_UART2>;
517517
resets = <&ccu RST_BUS_UART2>;
518518
dmas = <&dma 8>, <&dma 8>;
519-
dma-names = "rx", "tx";
519+
dma-names = "tx", "rx";
520520
status = "disabled";
521521
};
522522

@@ -529,7 +529,7 @@
529529
clocks = <&ccu CLK_BUS_UART3>;
530530
resets = <&ccu RST_BUS_UART3>;
531531
dmas = <&dma 9>, <&dma 9>;
532-
dma-names = "rx", "tx";
532+
dma-names = "tx", "rx";
533533
status = "disabled";
534534
};
535535

@@ -542,7 +542,7 @@
542542
clocks = <&ccu CLK_BUS_UART4>;
543543
resets = <&ccu RST_BUS_UART4>;
544544
dmas = <&dma 10>, <&dma 10>;
545-
dma-names = "rx", "tx";
545+
dma-names = "tx", "rx";
546546
status = "disabled";
547547
};
548548

0 commit comments

Comments
 (0)