Skip to content

Commit a140b18

Browse files
cristiccjernejsk
authored andcommitted
riscv: dts: allwinner: d1: 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> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Link: https://lore.kernel.org/r/20230321215624.78383-7-cristian.ciocaltea@collabora.com Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
1 parent bb9ecbe commit a140b18

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
clocks = <&ccu CLK_BUS_UART0>;
212212
resets = <&ccu RST_BUS_UART0>;
213213
dmas = <&dma 14>, <&dma 14>;
214-
dma-names = "rx", "tx";
214+
dma-names = "tx", "rx";
215215
status = "disabled";
216216
};
217217

@@ -224,7 +224,7 @@
224224
clocks = <&ccu CLK_BUS_UART1>;
225225
resets = <&ccu RST_BUS_UART1>;
226226
dmas = <&dma 15>, <&dma 15>;
227-
dma-names = "rx", "tx";
227+
dma-names = "tx", "rx";
228228
status = "disabled";
229229
};
230230

@@ -237,7 +237,7 @@
237237
clocks = <&ccu CLK_BUS_UART2>;
238238
resets = <&ccu RST_BUS_UART2>;
239239
dmas = <&dma 16>, <&dma 16>;
240-
dma-names = "rx", "tx";
240+
dma-names = "tx", "rx";
241241
status = "disabled";
242242
};
243243

@@ -250,7 +250,7 @@
250250
clocks = <&ccu CLK_BUS_UART3>;
251251
resets = <&ccu RST_BUS_UART3>;
252252
dmas = <&dma 17>, <&dma 17>;
253-
dma-names = "rx", "tx";
253+
dma-names = "tx", "rx";
254254
status = "disabled";
255255
};
256256

@@ -263,7 +263,7 @@
263263
clocks = <&ccu CLK_BUS_UART4>;
264264
resets = <&ccu RST_BUS_UART4>;
265265
dmas = <&dma 18>, <&dma 18>;
266-
dma-names = "rx", "tx";
266+
dma-names = "tx", "rx";
267267
status = "disabled";
268268
};
269269

@@ -276,7 +276,7 @@
276276
clocks = <&ccu CLK_BUS_UART5>;
277277
resets = <&ccu RST_BUS_UART5>;
278278
dmas = <&dma 19>, <&dma 19>;
279-
dma-names = "rx", "tx";
279+
dma-names = "tx", "rx";
280280
status = "disabled";
281281
};
282282

0 commit comments

Comments
 (0)