Skip to content

Commit a9efe94

Browse files
cristiccjernejsk
authored andcommitted
ARM: dts: sun6i: a31: 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-3-cristian.ciocaltea@collabora.com Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
1 parent 20c5db6 commit a9efe94

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

arch/arm/boot/dts/sun6i-a31.dtsi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@
822822
clocks = <&ccu CLK_APB2_UART0>;
823823
resets = <&ccu RST_APB2_UART0>;
824824
dmas = <&dma 6>, <&dma 6>;
825-
dma-names = "rx", "tx";
825+
dma-names = "tx", "rx";
826826
status = "disabled";
827827
};
828828

@@ -835,7 +835,7 @@
835835
clocks = <&ccu CLK_APB2_UART1>;
836836
resets = <&ccu RST_APB2_UART1>;
837837
dmas = <&dma 7>, <&dma 7>;
838-
dma-names = "rx", "tx";
838+
dma-names = "tx", "rx";
839839
status = "disabled";
840840
};
841841

@@ -848,7 +848,7 @@
848848
clocks = <&ccu CLK_APB2_UART2>;
849849
resets = <&ccu RST_APB2_UART2>;
850850
dmas = <&dma 8>, <&dma 8>;
851-
dma-names = "rx", "tx";
851+
dma-names = "tx", "rx";
852852
status = "disabled";
853853
};
854854

@@ -861,7 +861,7 @@
861861
clocks = <&ccu CLK_APB2_UART3>;
862862
resets = <&ccu RST_APB2_UART3>;
863863
dmas = <&dma 9>, <&dma 9>;
864-
dma-names = "rx", "tx";
864+
dma-names = "tx", "rx";
865865
status = "disabled";
866866
};
867867

@@ -874,7 +874,7 @@
874874
clocks = <&ccu CLK_APB2_UART4>;
875875
resets = <&ccu RST_APB2_UART4>;
876876
dmas = <&dma 10>, <&dma 10>;
877-
dma-names = "rx", "tx";
877+
dma-names = "tx", "rx";
878878
status = "disabled";
879879
};
880880

@@ -887,7 +887,7 @@
887887
clocks = <&ccu CLK_APB2_UART5>;
888888
resets = <&ccu RST_APB2_UART5>;
889889
dmas = <&dma 22>, <&dma 22>;
890-
dma-names = "rx", "tx";
890+
dma-names = "tx", "rx";
891891
status = "disabled";
892892
};
893893

0 commit comments

Comments
 (0)