| Message ID | 20230321215624.78383-3-cristian.ciocaltea@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Enable I2S support for RK3588/RK3588S SoCs | expand |
Dne torek, 21. marec 2023 ob 22:56:16 CEST je Cristian Ciocaltea napisal(a): > Commit 370f696e4474 ("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> Best regards, Jernej > --- > arch/arm/boot/dts/sun6i-a31.dtsi | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi > b/arch/arm/boot/dts/sun6i-a31.dtsi index 6cdadba6a3ac..5cce4918f84c 100644 > --- a/arch/arm/boot/dts/sun6i-a31.dtsi > +++ b/arch/arm/boot/dts/sun6i-a31.dtsi > @@ -822,7 +822,7 @@ uart0: serial@1c28000 { > clocks = <&ccu CLK_APB2_UART0>; > resets = <&ccu RST_APB2_UART0>; > dmas = <&dma 6>, <&dma 6>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -835,7 +835,7 @@ uart1: serial@1c28400 { > clocks = <&ccu CLK_APB2_UART1>; > resets = <&ccu RST_APB2_UART1>; > dmas = <&dma 7>, <&dma 7>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -848,7 +848,7 @@ uart2: serial@1c28800 { > clocks = <&ccu CLK_APB2_UART2>; > resets = <&ccu RST_APB2_UART2>; > dmas = <&dma 8>, <&dma 8>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -861,7 +861,7 @@ uart3: serial@1c28c00 { > clocks = <&ccu CLK_APB2_UART3>; > resets = <&ccu RST_APB2_UART3>; > dmas = <&dma 9>, <&dma 9>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -874,7 +874,7 @@ uart4: serial@1c29000 { > clocks = <&ccu CLK_APB2_UART4>; > resets = <&ccu RST_APB2_UART4>; > dmas = <&dma 10>, <&dma 10>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -887,7 +887,7 @@ uart5: serial@1c29400 { > clocks = <&ccu CLK_APB2_UART5>; > resets = <&ccu RST_APB2_UART5>; > dmas = <&dma 22>, <&dma 22>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > };
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index 6cdadba6a3ac..5cce4918f84c 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -822,7 +822,7 @@ uart0: serial@1c28000 { clocks = <&ccu CLK_APB2_UART0>; resets = <&ccu RST_APB2_UART0>; dmas = <&dma 6>, <&dma 6>; - dma-names = "rx", "tx"; + dma-names = "tx", "rx"; status = "disabled"; }; @@ -835,7 +835,7 @@ uart1: serial@1c28400 { clocks = <&ccu CLK_APB2_UART1>; resets = <&ccu RST_APB2_UART1>; dmas = <&dma 7>, <&dma 7>; - dma-names = "rx", "tx"; + dma-names = "tx", "rx"; status = "disabled"; }; @@ -848,7 +848,7 @@ uart2: serial@1c28800 { clocks = <&ccu CLK_APB2_UART2>; resets = <&ccu RST_APB2_UART2>; dmas = <&dma 8>, <&dma 8>; - dma-names = "rx", "tx"; + dma-names = "tx", "rx"; status = "disabled"; }; @@ -861,7 +861,7 @@ uart3: serial@1c28c00 { clocks = <&ccu CLK_APB2_UART3>; resets = <&ccu RST_APB2_UART3>; dmas = <&dma 9>, <&dma 9>; - dma-names = "rx", "tx"; + dma-names = "tx", "rx"; status = "disabled"; }; @@ -874,7 +874,7 @@ uart4: serial@1c29000 { clocks = <&ccu CLK_APB2_UART4>; resets = <&ccu RST_APB2_UART4>; dmas = <&dma 10>, <&dma 10>; - dma-names = "rx", "tx"; + dma-names = "tx", "rx"; status = "disabled"; }; @@ -887,7 +887,7 @@ uart5: serial@1c29400 { clocks = <&ccu CLK_APB2_UART5>; resets = <&ccu RST_APB2_UART5>; dmas = <&dma 22>, <&dma 22>; - dma-names = "rx", "tx"; + dma-names = "tx", "rx"; status = "disabled"; };
Commit 370f696e4474 ("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> --- arch/arm/boot/dts/sun6i-a31.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)