MLK-23694-13 arm64: dts: imx8mp-evk: integrate HDMI display

Integrate local HDMI display into EVK DTB to support the
DSI + LVDS + HDMI triple display, and previous single
display support for DSI, LVDS or HDMI is also remained.
Put LCDIF3 port to the same display-subsystem node as
LCDIF1 and LCDIF2 to realize this kind of triple display.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Reviewed-by: Liu Ying <victor.liu@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index 1c75f8e..987dad0 100644 (file)
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -37,7 +37,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mn-ddr4-evk.dtb imx8mn-ddr4-evk-ak5558.dtb imx8mn-
                          imx8mn-ddr4-evk-rpmsg.dtb imx8mn-ddr4-evk-root.dtb imx8mn-ddr4-evk-inmate.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mn-var-som-symphony.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk.dtb imx8mp-evk-rm67191.dtb imx8mp-evk-it6263-lvds-dual-channel.dtb \
-                         imx8mp-evk-jdi-wuxga-lvds-panel.dtb imx8mp-evk-hdmi.dtb
+                         imx8mp-evk-jdi-wuxga-lvds-panel.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk.dtb imx8mq-evk-rpmsg.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk.dtb imx8mq-evk-rpmsg.dtb imx8mq-evk-pcie1-m2.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk-ak4497.dtb imx8mq-evk-audio-tdm.dtb imx8mq-evk-pdm.dtb

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk-hdmi.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk-hdmi.dts
deleted file mode 100644 (file)
index 9e3102f..0000000
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk-hdmi.dts
+++ /dev/null
@@ -1,51 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright 2020 NXP
- */
-
-/dts-v1/;
-
-#include "imx8mp-evk.dts"
-
-/ {
-       sound-hdmi {
-               status = "okay";
-       };
-
-       display-subsystem {
-               compatible = "fsl,imx-display-subsystem";
-               ports = <&lcdif3_disp>;
-       };
-};
-
-&lcdif3 {
-       status = "okay";
-};
-
-&irqsteer_hdmi {
-       status = "okay";
-};
-
-&hdmimix_clk {
-       status = "okay";
-};
-
-&hdmimix_reset {
-       status = "okay";
-};
-
-&hdmi_pavi {
-       status = "okay";
-};
-
-&hdmi {
-       status = "okay";
-};
-
-&hdmiphy {
-       status = "okay";
-};
-
-&aud2htx {
-       status = "okay";
-};

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
index e6c7d20..b4e44a9 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mp-evk.dts
@@ -65,7 +65,7 @@
                                <48000>,
                                <96000>,
                                <192000>;
-               status = "disabled";
+               status = "okay";
        };
 
        sound-wm8960 {
@@ -147,6 +147,10 @@
        status = "okay";
 };
 
+&aud2htx {
+       status = "okay";
+};
+
 &eqos {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_eqos>;
@@ -360,6 +364,30 @@
        };
 };
 
+&irqsteer_hdmi {
+       status = "okay";
+};
+
+&hdmimix_clk {
+       status = "okay";
+};
+
+&hdmimix_reset {
+       status = "okay";
+};
+
+&hdmi_pavi {
+       status = "okay";
+};
+
+&hdmi {
+       status = "okay";
+};
+
+&hdmiphy {
+       status = "okay";
+};
+
 &lcdif1 {
        status = "okay";
 };
@@ -368,6 +396,10 @@
        status = "okay";
 };
 
+&lcdif3 {
+       status = "okay";
+};
+
 &ldb {
        status = "okay";
 

diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index 60a1914..563cae1 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -120,7 +120,8 @@
        display-subsystem {
                compatible = "fsl,imx-display-subsystem";
                ports = <&lcdif1_disp>,
-                       <&lcdif2_disp>;
+                       <&lcdif2_disp>,
+                       <&lcdif3_disp>;
        };
 
        a53_opp_table: opp-table {