From: Frank Li <Frank.Li@nxp.com>
Date: Mon, 19 Aug 2024 17:01:11 +0000 (-0400)
Subject: arm64: dts: fsl-ls1043a: move "fsl,ls1043a-qdma" ahead "fsl,ls1021a-qdma"
X-Git-Tag: v6.12-rc1~188^2~21^2~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d509a067be0443e06ba78c972c7cbb1fb6a0e3cc;p=thirdparty%2Fkernel%2Flinux.git

arm64: dts: fsl-ls1043a: move "fsl,ls1043a-qdma" ahead "fsl,ls1021a-qdma"

Move fsl,ls1043a-qdma ahead fallback string fsl,ls1021a-qdma.

Fix warning:
dma-controller@8380000: compatible: 'oneOf' conditional failed, one must be fixed:
        ['fsl,ls1021a-qdma', 'fsl,ls1043a-qdma'] is too long

Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
index cf92badc66558..e3b4cd269d2d5 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
@@ -955,7 +955,7 @@
 		};
 
 		qdma: dma-controller@8380000 {
-			compatible = "fsl,ls1021a-qdma", "fsl,ls1043a-qdma";
+			compatible = "fsl,ls1043a-qdma", "fsl,ls1021a-qdma";
 			reg = <0x0 0x8380000 0x0 0x1000>, /* Controller regs */
 			      <0x0 0x8390000 0x0 0x10000>, /* Status regs */
 			      <0x0 0x83a0000 0x0 0x40000>; /* Block regs */