| Message ID | 20230321215624.78383-1-cristian.ciocaltea@collabora.com |
|---|---|
| Headers | show |
| Series | Enable I2S support for RK3588/RK3588S SoCs | expand |
On Tue, Mar 21, 2023 at 11:56:20PM +0200, Cristian Ciocaltea wrote: > 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> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor. > --- > arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi > index 951810d46307..922e8e0e2c09 100644 > --- a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi > +++ b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi > @@ -211,7 +211,7 @@ uart0: serial@2500000 { > clocks = <&ccu CLK_BUS_UART0>; > resets = <&ccu RST_BUS_UART0>; > dmas = <&dma 14>, <&dma 14>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -224,7 +224,7 @@ uart1: serial@2500400 { > clocks = <&ccu CLK_BUS_UART1>; > resets = <&ccu RST_BUS_UART1>; > dmas = <&dma 15>, <&dma 15>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -237,7 +237,7 @@ uart2: serial@2500800 { > clocks = <&ccu CLK_BUS_UART2>; > resets = <&ccu RST_BUS_UART2>; > dmas = <&dma 16>, <&dma 16>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -250,7 +250,7 @@ uart3: serial@2500c00 { > clocks = <&ccu CLK_BUS_UART3>; > resets = <&ccu RST_BUS_UART3>; > dmas = <&dma 17>, <&dma 17>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -263,7 +263,7 @@ uart4: serial@2501000 { > clocks = <&ccu CLK_BUS_UART4>; > resets = <&ccu RST_BUS_UART4>; > dmas = <&dma 18>, <&dma 18>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -276,7 +276,7 @@ uart5: serial@2501400 { > clocks = <&ccu CLK_BUS_UART5>; > resets = <&ccu RST_BUS_UART5>; > dmas = <&dma 19>, <&dma 19>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > -- > 2.40.0 >
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"; > };
Dne torek, 21. marec 2023 ob 22:56:17 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/sun8i-a23-a33.dtsi | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi > b/arch/arm/boot/dts/sun8i-a23-a33.dtsi index f630ab55bb6a..4aa9d88c9ea3 > 100644 > --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi > +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi > @@ -490,7 +490,7 @@ uart0: serial@1c28000 { > clocks = <&ccu CLK_BUS_UART0>; > resets = <&ccu RST_BUS_UART0>; > dmas = <&dma 6>, <&dma 6>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -503,7 +503,7 @@ uart1: serial@1c28400 { > clocks = <&ccu CLK_BUS_UART1>; > resets = <&ccu RST_BUS_UART1>; > dmas = <&dma 7>, <&dma 7>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -516,7 +516,7 @@ uart2: serial@1c28800 { > clocks = <&ccu CLK_BUS_UART2>; > resets = <&ccu RST_BUS_UART2>; > dmas = <&dma 8>, <&dma 8>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -529,7 +529,7 @@ uart3: serial@1c28c00 { > clocks = <&ccu CLK_BUS_UART3>; > resets = <&ccu RST_BUS_UART3>; > dmas = <&dma 9>, <&dma 9>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -542,7 +542,7 @@ uart4: serial@1c29000 { > clocks = <&ccu CLK_BUS_UART4>; > resets = <&ccu RST_BUS_UART4>; > dmas = <&dma 10>, <&dma 10>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > };
Dne torek, 21. marec 2023 ob 22:56:18 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/sun8i-v3s.dtsi | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi > b/arch/arm/boot/dts/sun8i-v3s.dtsi index db194c606fdc..b001251644f7 100644 > --- a/arch/arm/boot/dts/sun8i-v3s.dtsi > +++ b/arch/arm/boot/dts/sun8i-v3s.dtsi > @@ -479,7 +479,7 @@ uart0: serial@1c28000 { > reg-io-width = <4>; > clocks = <&ccu CLK_BUS_UART0>; > dmas = <&dma 6>, <&dma 6>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > resets = <&ccu RST_BUS_UART0>; > status = "disabled"; > }; > @@ -492,7 +492,7 @@ uart1: serial@1c28400 { > reg-io-width = <4>; > clocks = <&ccu CLK_BUS_UART1>; > dmas = <&dma 7>, <&dma 7>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > resets = <&ccu RST_BUS_UART1>; > status = "disabled"; > }; > @@ -505,7 +505,7 @@ uart2: serial@1c28800 { > reg-io-width = <4>; > clocks = <&ccu CLK_BUS_UART2>; > dmas = <&dma 8>, <&dma 8>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > resets = <&ccu RST_BUS_UART2>; > pinctrl-0 = <&uart2_pins>; > pinctrl-names = "default";
Dne torek, 21. marec 2023 ob 22:56:19 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/sunxi-h3-h5.dtsi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi > b/arch/arm/boot/dts/sunxi-h3-h5.dtsi index 686193bd6bd9..ade1cd50e445 > 100644 > --- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi > +++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi > @@ -710,7 +710,7 @@ uart0: serial@1c28000 { > clocks = <&ccu CLK_BUS_UART0>; > resets = <&ccu RST_BUS_UART0>; > dmas = <&dma 6>, <&dma 6>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -723,7 +723,7 @@ uart1: serial@1c28400 { > clocks = <&ccu CLK_BUS_UART1>; > resets = <&ccu RST_BUS_UART1>; > dmas = <&dma 7>, <&dma 7>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -736,7 +736,7 @@ uart2: serial@1c28800 { > clocks = <&ccu CLK_BUS_UART2>; > resets = <&ccu RST_BUS_UART2>; > dmas = <&dma 8>, <&dma 8>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > }; > > @@ -749,7 +749,7 @@ uart3: serial@1c28c00 { > clocks = <&ccu CLK_BUS_UART3>; > resets = <&ccu RST_BUS_UART3>; > dmas = <&dma 9>, <&dma 9>; > - dma-names = "rx", "tx"; > + dma-names = "tx", "rx"; > status = "disabled"; > };
Dne torek, 21. marec 2023 ob 22:56:20 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> Applied patches 2-6, thanks! Best regards, Jernej
On 4/8/23 15:36, Jernej Škrabec wrote: > Dne torek, 21. marec 2023 ob 22:56:20 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> > > Applied patches 2-6, thanks! Hi Jernej, Please note the patches have been already picked by Greg and were merged in next-20230331. Regards, Cristian
There are five I2S/PCM/TDM controllers and two I2S/PCM controllers embedded in the RK3588 and RK3588S SoCs. Furthermore, RK3588 provides four additional I2S/PCM/TDM controllers. This patch series adds the required device tree nodes to support all the above. Additionally, it enables analog audio support for the Rock 5B SBC, which has been used to test both audio playback and recording. Note that some of the DT bindings fixes in this series are not particularly related to I2S, but are required for a proper dtbs_check validation. Changes in v2: - Rebased onto next-20230321 and drop patches 03-08/11 already applied by Mark - Replaced patch 01/11 with v2 07/10 - Reworked patch 02/11 to v2 01-06/10 - v1: https://lore.kernel.org/lkml/20230315114806.3819515-1-cristian.ciocaltea@collabora.com/ Cristian Ciocaltea (10): dt-bindings: serial: snps-dw-apb-uart: Switch dma-names order ARM: dts: sun6i: a31: Switch dma-names order for snps,dw-apb-uart nodes ARM: dts: sun8i: a23/a33: Switch dma-names order for snps,dw-apb-uart nodes ARM: dts: sun8i: v3s: Switch dma-names order for snps,dw-apb-uart nodes ARM: dts: sunxi: h3/h5: Switch dma-names order for snps,dw-apb-uart nodes riscv: dts: allwinner: d1: Switch dma-names order for snps,dw-apb-uart nodes arm64: dts: rockchip: rk3588s: Move assigned-clocks/assigned-clock-rates out of scmi arm64: dts: rockchip: rk3588s: Add I2S nodes arm64: dts: rockchip: rk3588: Add I2S nodes arm64: dts: rockchip: rk3588-rock-5b: Add analog audio .../bindings/serial/snps-dw-apb-uart.yaml | 2 +- arch/arm/boot/dts/sun6i-a31.dtsi | 12 +- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 10 +- arch/arm/boot/dts/sun8i-v3s.dtsi | 6 +- arch/arm/boot/dts/sunxi-h3-h5.dtsi | 8 +- .../boot/dts/rockchip/rk3588-rock-5b.dts | 62 +++++++ arch/arm64/boot/dts/rockchip/rk3588.dtsi | 68 ++++++++ arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 156 +++++++++++++++++- .../boot/dts/allwinner/sunxi-d1s-t113.dtsi | 12 +- 9 files changed, 307 insertions(+), 29 deletions(-)