diff options
| author |   Max Merchel <Max.Merchel@ew.tq-group.com> | 2025-02-25 15:44:35 +0100 |
|---|---|---|
| committer |   Shawn Guo <shawnguo@kernel.org> | 2025-03-11 10:46:38 +0800 |
| commit | 22d8f69c8ddcd036d6e81589e95a058b86272bd1 (patch) | |
| tree | fa53ecc224feab2f5c2f97bf657df67da6c39579 | |
| parent | ARM: dts: imx53-mba53: Fix the PCA9554 compatible (diff) | |
| download | wireguard-linux-22d8f69c8ddcd036d6e81589e95a058b86272bd1.tar.xz wireguard-linux-22d8f69c8ddcd036d6e81589e95a058b86272bd1.zip | |
ARM: dts: imx6ul-tqma6ul1: Change include order to disable fec2 node
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>
| -rw-r--r-- | arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts index f2a5f17f312e..2e7b96e7b791 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts +++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1-mba6ulx.dts @@ -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"; diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi index 24192d012ef7..79c8c5529135 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul1.dtsi @@ -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"; |