MLK-16327-2: ARM64: dts: fsl-imx8qm/qxp: correct edma channel name

Correct edma channel name to support unique edma channel name in multi
edma instances.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi
index 0f98588..4afa75d 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi
@@ -1891,11 +1891,11 @@
                             <GIC_SPI 441 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 442 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 443 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "edma-chan12-tx", "edma-chan13-tx",
-                                 "edma-chan14-tx", "edma-chan15-tx",
-                                 "edma-chan16-tx", "edma-chan17-tx",
-                                 "edma-chan18-tx", "edma-chan19-tx",
-                                 "edma-chan20-tx", "edma-chan21-tx";
+               interrupt-names = "edma0-chan12-rx", "edma0-chan13-tx",
+                                 "edma0-chan14-rx", "edma0-chan15-tx",
+                                 "edma0-chan16-rx", "edma0-chan17-tx",
+                                 "edma0-chan18-rx", "edma0-chan19-tx",
+                                 "edma0-chan20-rx", "edma0-chan21-tx";
                status = "okay";
        };
 
@@ -1932,13 +1932,13 @@
                                <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
                                <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>, /* sai1 */
                                <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "edma-chan0-tx", "edma-chan1-tx", /* asrc0 */
-                               "edma-chan2-tx", "edma-chan3-tx",
-                               "edma-chan4-tx", "edma-chan5-tx",
-                               "edma-chan6-tx", "edma-chan7-tx", /* esai0 */
-                               "edma-chan8-tx", "edma-chan9-tx", /* spdif0 */
-                               "edma-chan12-tx", "edma-chan13-tx", /* sai0 */
-                               "edma-chan14-tx", "edma-chan15-tx"; /* sai1 */
+               interrupt-names = "edma2-chan0-rx", "edma2-chan1-rx", /* asrc0 */
+                               "edma2-chan2-rx", "edma2-chan3-tx",
+                               "edma2-chan4-tx", "edma2-chan5-tx",
+                               "edma2-chan6-rx", "edma2-chan7-tx", /* esai0 */
+                               "edma2-chan8-rx", "edma2-chan9-tx", /* spdif0 */
+                               "edma2-chan12-rx", "edma2-chan13-tx", /* sai0 */
+                               "edma2-chan14-rx", "edma2-chan15-tx"; /* sai1 */
                status = "okay";
        };
 
@@ -1965,11 +1965,11 @@
                                <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>, /* sai6 */
                                <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
                                <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>; /* sai7 */
-               interrupt-names = "edma-chan0-tx", "edma-chan1-tx", /* asrc1 */
-                               "edma-chan2-tx", "edma-chan3-tx",
-                               "edma-chan4-tx", "edma-chan5-tx",
-                               "edma-chan8-tx", "edma-chan9-tx", /* sai6 */
-                               "edma-chan10-tx";                 /* sai7 */
+               interrupt-names = "edma3-chan0-rx", "edma3-chan1-rx", /* asrc1 */
+                               "edma3-chan2-rx", "edma3-chan3-tx",
+                               "edma3-chan4-tx", "edma3-chan5-tx",
+                               "edma3-chan8-rx", "edma3-chan9-tx", /* sai6 */
+                               "edma3-chan10-tx";                 /* sai7 */
                status = "okay";
        };
 

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi
index 5a82d0c..36ff513 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp.dtsi
@@ -1639,10 +1639,10 @@
                             <GIC_SPI 439 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 440 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 441 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "edma-chan8-tx", "edma-chan9-tx",
-                                 "edma-chan10-tx", "edma-chan11-tx",
-                                 "edma-chan12-tx", "edma-chan13-tx",
-                                 "edma-chan14-tx", "edma-chan15-tx";
+               interrupt-names = "edma0-chan8-rx", "edma0-chan9-tx",
+                                 "edma0-chan10-rx", "edma0-chan11-tx",
+                                 "edma0-chan12-rx", "edma0-chan13-tx",
+                                 "edma0-chan14-rx", "edma0-chan15-tx";
                status = "okay";
        };
 
@@ -1683,15 +1683,15 @@
                                <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
                                <GIC_SPI 368 IRQ_TYPE_LEVEL_HIGH>,
                                <GIC_SPI 368 IRQ_TYPE_LEVEL_HIGH>;
-               interrupt-names = "edma-chan0-tx", "edma-chan1-tx", /* asrc0 */
-                               "edma-chan2-tx", "edma-chan3-tx",
-                               "edma-chan4-tx", "edma-chan5-tx",
-                               "edma-chan6-tx", "edma-chan7-tx", /* esai0 */
-                               "edma-chan8-tx", "edma-chan9-tx", /* spdif0 */
-                               "edma-chan12-tx", "edma-chan13-tx", /* sai0 */
-                               "edma-chan14-tx", "edma-chan15-tx", /* sai1 */
-                               "edma-chan21-tx",               /* gpt5 */
-                               "edma-chan23-tx";               /* gpt7 */
+               interrupt-names = "edma2-chan0-rx", "edma2-chan1-rx", /* asrc0 */
+                               "edma2-chan2-rx", "edma2-chan3-tx",
+                               "edma2-chan4-tx", "edma2-chan5-tx",
+                               "edma2-chan6-rx", "edma2-chan7-tx", /* esai0 */
+                               "edma2-chan8-rx", "edma2-chan9-tx", /* spdif0 */
+                               "edma2-chan12-rx", "edma2-chan13-tx", /* sai0 */
+                               "edma2-chan14-rx", "edma2-chan15-tx", /* sai1 */
+                               "edma2-chan21-tx",              /* gpt5 */
+                               "edma2-chan23-rx";              /* gpt7 */
                status = "okay";
        };
 
@@ -1718,11 +1718,11 @@
                                <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>, /* sai4 */
                                <GIC_SPI 330 IRQ_TYPE_LEVEL_HIGH>,
                                <GIC_SPI 332 IRQ_TYPE_LEVEL_HIGH>; /* sai5 */
-               interrupt-names = "edma-chan0-tx", "edma-chan1-tx", /* asrc1 */
-                               "edma-chan2-tx", "edma-chan3-tx",
-                               "edma-chan4-tx", "edma-chan5-tx",
-                               "edma-chan8-tx", "edma-chan9-tx", /* sai4 */
-                               "edma-chan10-tx";                 /* sai5 */
+               interrupt-names = "edma3-chan0-rx", "edma3-chan1-rx", /* asrc1 */
+                               "edma3-chan2-rx", "edma3-chan3-tx",
+                               "edma3-chan4-tx", "edma3-chan5-tx",
+                               "edma3-chan8-rx", "edma3-chan9-tx", /* sai4 */
+                               "edma3-chan10-tx";                 /* sai5 */
                status = "okay";
        };