]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ARM: dts: imx6ul-tqma6ul1: Change include order to disable fec2 node
authorMax Merchel <Max.Merchel@ew.tq-group.com>
Tue, 25 Feb 2025 14:44:35 +0000 (15:44 +0100)
committerShawn Guo <shawnguo@kernel.org>
Tue, 11 Mar 2025 02:46:38 +0000 (10:46 +0800)
TQMa6UL1 has only one FEC which needs to be disabled as one of the last
steps.
imx6ul-tqma6ul2.dtsi can't be included in imx6ul-tqma6ul1.dtsi as the
defaults from imx6ul.dtsi will be applied again.

Fixes: 7b8861d8e627 ("ARM: dts: imx6ul: add TQ-Systems MBa6ULx device trees")
Signed-off-by: Max Merchel <Max.Merchel@ew.tq-group.com>
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts
arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi

index f2a5f17f312e5840851c6083c3c9aba9184ceca3..2e7b96e7b791dbdc1b8503d727e3ebc2a76ea597 100644 (file)
@@ -6,8 +6,9 @@
 
 /dts-v1/;
 
-#include "imx6ul-tqma6ul1.dtsi"
+#include "imx6ul-tqma6ul2.dtsi"
 #include "mba6ulx.dtsi"
+#include "imx6ul-tqma6ul1.dtsi"
 
 / {
        model = "TQ-Systems TQMa6UL1 SoM on MBa6ULx board";
index 24192d012ef7e640d76d5a9fdf4a5f5786005781..79c8c5529135a45c3a0dfb5c0bbeeb041e2d73b4 100644 (file)
@@ -4,8 +4,6 @@
  * Author: Markus Niebel <Markus.Niebel@tq-group.com>
  */
 
-#include "imx6ul-tqma6ul2.dtsi"
-
 / {
        model = "TQ-Systems TQMa6UL1 SoM";
        compatible = "tq,imx6ul-tqma6ul1", "fsl,imx6ul";