diff options
author | Sandor Yu <Sandor.yu@nxp.com> | 2019-08-22 14:22:53 +0800 |
---|---|---|
committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 16:06:45 +0800 |
commit | b0cae40bf7cbab5a0ec0c451718c575b2be6ce47 (patch) | |
tree | c92133d0b680e7a1788ff5fe009a053d6935ec28 /arch/arm64/boot/dts/freescale | |
parent | 5a8a6c85de3a9bc3b1bf79701a3c9ccfc53dd9da (diff) |
arm64: imx8qm mek: Add hdmi tx support
Move hdmi tx function out of imx8qm-mek.dts.
Disable lvds devices in imx8qm-mek-hdmi.dts,
then hdmi tx function should not depend on LVDS connector plugged.
Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
Diffstat (limited to 'arch/arm64/boot/dts/freescale')
-rw-r--r-- | arch/arm64/boot/dts/freescale/Makefile | 3 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8qm-mek-hdmi.dts | 30 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8qm-ss-dc.dtsi | 4 | ||||
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8qm.dtsi | 1 |
4 files changed, 37 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index 388181b92697..7f14b01c2257 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -31,7 +31,8 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mq-pico-pi.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-max9286.dtb \ - imx8qm-mek-enet2-tja1100.dtb imx8qm-mek-rpmsg.dtb + imx8qm-mek-enet2-tja1100.dtb imx8qm-mek-rpmsg.dtb \ + imx8qm-mek-hdmi.dtb dtb-$(CONFIG_ARCH_MXC) += imx8qxp-ai_ml.dtb dtb-$(CONFIG_ARCH_MXC) += imx8qxp-mek.dtb imx8qxp-mek-dsp.dtb imx8qxp-mek-max9286.dtb \ imx8qxp-mek-enet2.dtb imx8qxp-mek-enet2-tja1100.dtb imx8qxp-mek-sof.dtb \ diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-hdmi.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-hdmi.dts new file mode 100644 index 000000000000..ad38b1062fc1 --- /dev/null +++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-hdmi.dts @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2019 NXP + * Sandor Yu <Sandor.yu@nxp.com> + */ + +/dts-v1/; + +#include "imx8qm-mek.dts" + +&ldb1_phy { + status = "disabled"; +}; + +&ldb1 { + status = "disabled"; +}; + +&ldb2_phy { + status = "disabled"; +}; + +&ldb2 { + status = "disabled"; +}; + +&hdmi { + compatible = "cdn,imx8qm-hdmi"; + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/freescale/imx8qm-ss-dc.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-ss-dc.dtsi index d77a19f09ea5..632db067c84a 100644 --- a/arch/arm64/boot/dts/freescale/imx8qm-ss-dc.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qm-ss-dc.dtsi @@ -9,6 +9,10 @@ dpu1_disp0: port@0 { reg = <0>; + + dpu1_disp0_hdmi: endpoint@0 { + remote-endpoint = <&hdmi_disp>; + }; }; dpu1_disp1: port@1 { diff --git a/arch/arm64/boot/dts/freescale/imx8qm.dtsi b/arch/arm64/boot/dts/freescale/imx8qm.dtsi index e2c6ae1e8e14..372514da080f 100644 --- a/arch/arm64/boot/dts/freescale/imx8qm.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qm.dtsi @@ -432,4 +432,5 @@ #include "imx8qm-ss-hsio.dtsi" #include "imx8qm-ss-dc.dtsi" #include "imx8qm-ss-lvds.dtsi" +#include "imx8qm-ss-hdmi.dtsi" #include "imx8qm-ss-img.dtsi" |