| Message ID | 20240419-imx93-dts-4-13-v2-1-9076e1d7d399@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: imx93: various update | expand |
On Fri, Apr 19, 2024 at 11:36:56AM +0800, Peng Fan (OSS) wrote: > From: Peng Fan <peng.fan@nxp.com> > > Use FSL_EDMA_RX for dma rx channel bitmask, which is intuitive. > > Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> > --- > arch/arm64/boot/dts/freescale/imx93.dtsi | 25 +++++++++++++------------ > 1 file changed, 13 insertions(+), 12 deletions(-) > > diff --git a/arch/arm64/boot/dts/freescale/imx93.dtsi b/arch/arm64/boot/dts/freescale/imx93.dtsi > index b8ef9b938856..42bbe491a29b 100644 > --- a/arch/arm64/boot/dts/freescale/imx93.dtsi > +++ b/arch/arm64/boot/dts/freescale/imx93.dtsi > @@ -4,6 +4,7 @@ > */ > > #include <dt-bindings/clock/imx93-clock.h> > +#include <dt-bindings/dma/fsl-edma.h> > #include <dt-bindings/gpio/gpio.h> > #include <dt-bindings/input/input.h> > #include <dt-bindings/interrupt-controller/arm-gic.h> > @@ -361,7 +362,7 @@ lpuart1: serial@44380000 { > interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&clk IMX93_CLK_LPUART1_GATE>; > clock-names = "ipg"; > - dmas = <&edma1 17 0 1>, <&edma1 16 0 0>; > + dmas = <&edma1 17 0 FSL_EDMA_RX>, <&edma1 16 0 0>; > dma-names = "rx", "tx"; > status = "disabled"; > }; > @@ -372,7 +373,7 @@ lpuart2: serial@44390000 { > interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&clk IMX93_CLK_LPUART2_GATE>; > clock-names = "ipg"; > - dmas = <&edma1 19 0 1>, <&edma1 18 0 0>; > + dmas = <&edma1 19 0 FSL_EDMA_RX>, <&edma1 18 0 0>; > dma-names = "rx", "tx"; > status = "disabled"; > }; > @@ -400,7 +401,7 @@ sai1: sai@443b0000 { > <&clk IMX93_CLK_SAI1_GATE>, <&clk IMX93_CLK_DUMMY>, > <&clk IMX93_CLK_DUMMY>; > clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3"; > - dmas = <&edma1 22 0 1>, <&edma1 21 0 0>; > + dmas = <&edma1 22 0 FSL_EDMA_RX>, <&edma1 21 0 0>; > dma-names = "rx", "tx"; > status = "disabled"; > }; > @@ -737,7 +738,7 @@ lpuart3: serial@42570000 { > interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&clk IMX93_CLK_LPUART3_GATE>; > clock-names = "ipg"; > - dmas = <&edma2 18 0 1>, <&edma2 17 0 0>; > + dmas = <&edma2 18 0 FSL_EDMA_RX>, <&edma2 17 0 0>; > dma-names = "rx", "tx"; > status = "disabled"; > }; > @@ -748,7 +749,7 @@ lpuart4: serial@42580000 { > interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&clk IMX93_CLK_LPUART4_GATE>; > clock-names = "ipg"; > - dmas = <&edma2 20 0 1>, <&edma2 19 0 0>; > + dmas = <&edma2 20 0 FSL_EDMA_RX>, <&edma2 19 0 0>; > dma-names = "rx", "tx"; > status = "disabled"; > }; > @@ -759,7 +760,7 @@ lpuart5: serial@42590000 { > interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&clk IMX93_CLK_LPUART5_GATE>; > clock-names = "ipg"; > - dmas = <&edma2 22 0 1>, <&edma2 21 0 0>; > + dmas = <&edma2 22 0 FSL_EDMA_RX>, <&edma2 21 0 0>; > dma-names = "rx", "tx"; > status = "disabled"; > }; > @@ -770,7 +771,7 @@ lpuart6: serial@425a0000 { > interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&clk IMX93_CLK_LPUART6_GATE>; > clock-names = "ipg"; > - dmas = <&edma2 24 0 1>, <&edma2 23 0 0>; > + dmas = <&edma2 24 0 FSL_EDMA_RX>, <&edma2 23 0 0>; > dma-names = "rx", "tx"; > status = "disabled"; > }; > @@ -813,7 +814,7 @@ sai2: sai@42650000 { > <&clk IMX93_CLK_SAI2_GATE>, <&clk IMX93_CLK_DUMMY>, > <&clk IMX93_CLK_DUMMY>; > clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3"; > - dmas = <&edma2 59 0 1>, <&edma2 58 0 0>; > + dmas = <&edma2 59 0 FSL_EDMA_RX>, <&edma2 58 0 0>; > dma-names = "rx", "tx"; > status = "disabled"; > }; > @@ -826,7 +827,7 @@ sai3: sai@42660000 { > <&clk IMX93_CLK_SAI3_GATE>, <&clk IMX93_CLK_DUMMY>, > <&clk IMX93_CLK_DUMMY>; > clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3"; > - dmas = <&edma2 61 0 1>, <&edma2 60 0 0>; > + dmas = <&edma2 61 0 FSL_EDMA_RX>, <&edma2 60 0 0>; > dma-names = "rx", "tx"; > status = "disabled"; > }; > @@ -845,7 +846,7 @@ xcvr: xcvr@42680000 { > <&clk IMX93_CLK_DUMMY>, > <&clk IMX93_CLK_AUD_XCVR_GATE>; > clock-names = "ipg", "phy", "spba", "pll_ipg"; > - dmas = <&edma2 65 0 1>, <&edma2 66 0 0>; > + dmas = <&edma2 65 0 FSL_EDMA_RX>, <&edma2 66 0 0>; > dma-names = "rx", "tx"; > status = "disabled"; > }; > @@ -856,7 +857,7 @@ lpuart7: serial@42690000 { > interrupts = <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&clk IMX93_CLK_LPUART7_GATE>; > clock-names = "ipg"; > - dmas = <&edma2 88 0 1>, <&edma2 87 0 0>; > + dmas = <&edma2 88 0 FSL_EDMA_RX>, <&edma2 87 0 0>; > dma-names = "rx", "tx"; > status = "disabled"; > }; > @@ -867,7 +868,7 @@ lpuart8: serial@426a0000 { > interrupts = <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>; > clocks = <&clk IMX93_CLK_LPUART8_GATE>; > clock-names = "ipg"; > - dmas = <&edma2 90 0 1>, <&edma2 89 0 0>; > + dmas = <&edma2 90 0 FSL_EDMA_RX>, <&edma2 89 0 0>; > dma-names = "rx", "tx"; > status = "disabled"; > }; > > -- > 2.37.1 >
diff --git a/arch/arm64/boot/dts/freescale/imx93.dtsi b/arch/arm64/boot/dts/freescale/imx93.dtsi index b8ef9b938856..42bbe491a29b 100644 --- a/arch/arm64/boot/dts/freescale/imx93.dtsi +++ b/arch/arm64/boot/dts/freescale/imx93.dtsi @@ -4,6 +4,7 @@ */ #include <dt-bindings/clock/imx93-clock.h> +#include <dt-bindings/dma/fsl-edma.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> #include <dt-bindings/interrupt-controller/arm-gic.h> @@ -361,7 +362,7 @@ lpuart1: serial@44380000 { interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk IMX93_CLK_LPUART1_GATE>; clock-names = "ipg"; - dmas = <&edma1 17 0 1>, <&edma1 16 0 0>; + dmas = <&edma1 17 0 FSL_EDMA_RX>, <&edma1 16 0 0>; dma-names = "rx", "tx"; status = "disabled"; }; @@ -372,7 +373,7 @@ lpuart2: serial@44390000 { interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk IMX93_CLK_LPUART2_GATE>; clock-names = "ipg"; - dmas = <&edma1 19 0 1>, <&edma1 18 0 0>; + dmas = <&edma1 19 0 FSL_EDMA_RX>, <&edma1 18 0 0>; dma-names = "rx", "tx"; status = "disabled"; }; @@ -400,7 +401,7 @@ sai1: sai@443b0000 { <&clk IMX93_CLK_SAI1_GATE>, <&clk IMX93_CLK_DUMMY>, <&clk IMX93_CLK_DUMMY>; clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3"; - dmas = <&edma1 22 0 1>, <&edma1 21 0 0>; + dmas = <&edma1 22 0 FSL_EDMA_RX>, <&edma1 21 0 0>; dma-names = "rx", "tx"; status = "disabled"; }; @@ -737,7 +738,7 @@ lpuart3: serial@42570000 { interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk IMX93_CLK_LPUART3_GATE>; clock-names = "ipg"; - dmas = <&edma2 18 0 1>, <&edma2 17 0 0>; + dmas = <&edma2 18 0 FSL_EDMA_RX>, <&edma2 17 0 0>; dma-names = "rx", "tx"; status = "disabled"; }; @@ -748,7 +749,7 @@ lpuart4: serial@42580000 { interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk IMX93_CLK_LPUART4_GATE>; clock-names = "ipg"; - dmas = <&edma2 20 0 1>, <&edma2 19 0 0>; + dmas = <&edma2 20 0 FSL_EDMA_RX>, <&edma2 19 0 0>; dma-names = "rx", "tx"; status = "disabled"; }; @@ -759,7 +760,7 @@ lpuart5: serial@42590000 { interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk IMX93_CLK_LPUART5_GATE>; clock-names = "ipg"; - dmas = <&edma2 22 0 1>, <&edma2 21 0 0>; + dmas = <&edma2 22 0 FSL_EDMA_RX>, <&edma2 21 0 0>; dma-names = "rx", "tx"; status = "disabled"; }; @@ -770,7 +771,7 @@ lpuart6: serial@425a0000 { interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk IMX93_CLK_LPUART6_GATE>; clock-names = "ipg"; - dmas = <&edma2 24 0 1>, <&edma2 23 0 0>; + dmas = <&edma2 24 0 FSL_EDMA_RX>, <&edma2 23 0 0>; dma-names = "rx", "tx"; status = "disabled"; }; @@ -813,7 +814,7 @@ sai2: sai@42650000 { <&clk IMX93_CLK_SAI2_GATE>, <&clk IMX93_CLK_DUMMY>, <&clk IMX93_CLK_DUMMY>; clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3"; - dmas = <&edma2 59 0 1>, <&edma2 58 0 0>; + dmas = <&edma2 59 0 FSL_EDMA_RX>, <&edma2 58 0 0>; dma-names = "rx", "tx"; status = "disabled"; }; @@ -826,7 +827,7 @@ sai3: sai@42660000 { <&clk IMX93_CLK_SAI3_GATE>, <&clk IMX93_CLK_DUMMY>, <&clk IMX93_CLK_DUMMY>; clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3"; - dmas = <&edma2 61 0 1>, <&edma2 60 0 0>; + dmas = <&edma2 61 0 FSL_EDMA_RX>, <&edma2 60 0 0>; dma-names = "rx", "tx"; status = "disabled"; }; @@ -845,7 +846,7 @@ xcvr: xcvr@42680000 { <&clk IMX93_CLK_DUMMY>, <&clk IMX93_CLK_AUD_XCVR_GATE>; clock-names = "ipg", "phy", "spba", "pll_ipg"; - dmas = <&edma2 65 0 1>, <&edma2 66 0 0>; + dmas = <&edma2 65 0 FSL_EDMA_RX>, <&edma2 66 0 0>; dma-names = "rx", "tx"; status = "disabled"; }; @@ -856,7 +857,7 @@ lpuart7: serial@42690000 { interrupts = <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk IMX93_CLK_LPUART7_GATE>; clock-names = "ipg"; - dmas = <&edma2 88 0 1>, <&edma2 87 0 0>; + dmas = <&edma2 88 0 FSL_EDMA_RX>, <&edma2 87 0 0>; dma-names = "rx", "tx"; status = "disabled"; }; @@ -867,7 +868,7 @@ lpuart8: serial@426a0000 { interrupts = <GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk IMX93_CLK_LPUART8_GATE>; clock-names = "ipg"; - dmas = <&edma2 90 0 1>, <&edma2 89 0 0>; + dmas = <&edma2 90 0 FSL_EDMA_RX>, <&edma2 89 0 0>; dma-names = "rx", "tx"; status = "disabled"; };