LF-38: arm64: dts: imx8mq: Remove imx8mq-evk-hdmi.dts

Remove imx8mq-evk-hdmi.dts file.
Because native hdmi is the default display for imx8mq evk board.
hdmi properties are moved to imx8mq-evk.dts.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index ad4729d..8bc9769 100644 (file)
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -49,7 +49,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mq-nitrogen.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mq-phanbell.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mq-pico-pi.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mq-thor96.dtb
-dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk-hdmi.dtb imx8mq-evk-dp.dtb
+dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk-dp.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mq-zii-ultra-rmb3.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mq-zii-ultra-zest.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8qm-mek.dtb imx8qm-mek-ov5640.dtb \

diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk-hdmi.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk-hdmi.dts
deleted file mode 100644 (file)
index 48e9003..0000000
--- a/arch/arm64/boot/dts/freescale/imx8mq-evk-hdmi.dts
+++ /dev/null
@@ -1,50 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright 2019 NXP.
- */
-
-#include "imx8mq-evk.dts"
-
-/ {
-       sound-hdmi {
-               compatible = "fsl,imx8mq-evk-cdnhdmi",
-                               "fsl,imx-audio-cdnhdmi";
-               model = "imx-audio-hdmi";
-               audio-cpu = <&sai4>;
-               protocol = <1>;
-               hdmi-out;
-               constraint-rate = <44100>,
-                               <88200>,
-                               <176400>,
-                               <32000>,
-                               <48000>,
-                               <96000>,
-                               <192000>;
-       };
-};
-
-&irqsteer {
-       status = "okay";
-};
-
-&dcss {
-       status = "okay";
-       disp-dev = "hdmi_disp";
-
-       port@0 {
-               dcss_out: endpoint {
-                       remote-endpoint = <&hdmi_in>;
-               };
-       };
-};
-
-&hdmi {
-       compatible = "cdn,imx8mq-hdmi";
-       lane-mapping = <0xe4>;
-       status = "okay";
-       port@1 {
-               hdmi_in: endpoint {
-                       remote-endpoint = <&dcss_out>;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
index e021a43..cf2cdb4 100755 (executable)
--- a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
@@ -134,6 +134,22 @@
                };
        };
 
+       sound-hdmi {
+               compatible = "fsl,imx8mq-evk-cdnhdmi",
+                               "fsl,imx-audio-cdnhdmi";
+               model = "imx-audio-hdmi";
+               audio-cpu = <&sai4>;
+               protocol = <1>;
+               hdmi-out;
+               constraint-rate = <44100>,
+                               <88200>,
+                               <176400>,
+                               <32000>,
+                               <48000>,
+                               <96000>,
+                               <192000>;
+       };
+
        sound-spdif {
                compatible = "fsl,imx-audio-spdif";
                model = "imx-spdif";
@@ -171,7 +187,6 @@
                audio-codec = <&ak4497>;
                status = "disabled";
        };
-
 };
 
 &A53_0 {
@@ -1145,3 +1160,29 @@
 &gpu3d {
        status = "okay";
 };
+
+&irqsteer {
+       status = "okay";
+};
+
+&dcss {
+       status = "okay";
+       disp-dev = "hdmi_disp";
+
+       port@0 {
+               dcss_out: endpoint {
+                       remote-endpoint = <&hdmi_in>;
+               };
+       };
+};
+
+&hdmi {
+       compatible = "cdn,imx8mq-hdmi";
+       lane-mapping = <0xe4>;
+       status = "okay";
+       port@1 {
+               hdmi_in: endpoint {
+                       remote-endpoint = <&dcss_out>;
+               };
+       };
+};