redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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

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>
5.4-rM2-2.2.x-imx-squashed
Fancy Fang 2020-04-01 21:57:51 +08:00
parent 46552dfa17
commit 864c8ad56a
4 changed files with 38 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm64/boot/dts/freescale/Makefile
View File

@ -58,10 +58,9 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mn-evk.dtb imx8mn-evk-rm67191.dtb imx8mn-ddr4-evk.
imx8mn-ddr4-evk-rm67191.dtb imx8mn-ddr4-evk-rpmsg.dtb imx8mn-ddr4-evk-usd-wifi.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8mn-ddr4-evk-root.dtb imx8mn-ddr4-evk-inmate.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk.dtb imx8mp-evk-root.dtb imx8mp-evk-inmate.dtb imx8mp-evk-rpmsg.dtb \
imx8mp-evk-rm67191.dtb imx8mp-evk-hdmi.dtb imx8mp-evk-flexcan2.dtb \
imx8mp-evk-it6263-lvds-dual-channel.dtb imx8mp-evk-jdi-wuxga-lvds-panel.dtb \
imx8mp-ab2.dtb imx8mp-evk-sof-wm8960.dtb imx8mp-evk-dsp.dtb imx8mp-evk-ov2775.dtb \
imx8mp-evk-basler.dtb
imx8mp-evk-rm67191.dtb imx8mp-evk-flexcan2.dtb imx8mp-evk-it6263-lvds-dual-channel.dtb \
imx8mp-evk-jdi-wuxga-lvds-panel.dtb imx8mp-ab2.dtb imx8mp-evk-sof-wm8960.dtb \
imx8mp-evk-dsp.dtb imx8mp-evk-ov2775.dtb imx8mp-evk-basler.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk.dtb imx8mq-evk-rpmsg.dtb imx8mq-evk-pcie1-m2.dtb imx8mq-evk-usd-wifi.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk-ak4497.dtb imx8mq-evk-audio-tdm.dtb imx8mq-evk-pdm.dtb
dtb-$(CONFIG_ARCH_MXC) += imx8mq-evk-root.dtb imx8mq-evk-inmate.dtb

59
arch/arm64/boot/dts/freescale/imx8mp-evk-hdmi.dts
View File

@ -1,59 +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>;
};
};
&mipi_dsi {
status = "disabled";
};
&lcdif1 {
status = "disabled";
};
&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";
};

34
arch/arm64/boot/dts/freescale/imx8mp-evk.dts
View File

@ -119,7 +119,7 @@
<48000>,
<96000>,
<192000>;
status = "disabled";
status = "okay";
};
sound-wm8960 {
@ -181,6 +181,10 @@
};
};
&aud2htx {
status = "okay";
};
&clk {
init-on-array = <IMX8MP_CLK_HSIO_ROOT>;
};
@ -543,6 +547,10 @@
};
};
&irqsteer_hdmi {
status = "okay";
};
&flexcan1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flexcan1>;
@ -558,6 +566,26 @@
status = "disabled";/* can2 pin conflict with pdm: gpio low select pdm, gpio high select can2 */
};
&hdmimix_clk {
status = "okay";
};
&hdmimix_reset {
status = "okay";
};
&hdmi_pavi {
status = "okay";
};
&hdmi {
status = "okay";
};
&hdmiphy {
status = "okay";
};
&lcdif1 {
status = "okay";
};
@ -566,6 +594,10 @@
status = "okay";
};
&lcdif3 {
status = "okay";
};
&ldb {
status = "okay";

3
arch/arm64/boot/dts/freescale/imx8mp.dtsi
View File

@ -2129,7 +2129,8 @@
display-subsystem {
compatible = "fsl,imx-display-subsystem";
ports = <&lcdif1_disp>,
<&lcdif2_disp>;
<&lcdif2_disp>,
<&lcdif3_disp>;
};
imx_ion: imx_ion {