diff options
| author | Sandor Yu <Sandor.yu@nxp.com> | 2019-11-21 18:03:03 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 16:10:20 +0800 |
| commit | 3b79fecbfe0ba9a76ec047c502da0563d7fdbac2 (patch) | |
| tree | 71c9d179594a4552e8df6e48e141156ce83f2d15 /arch/arm64/boot | |
| parent | ca9229d41b0a3c5a7e773e9592b367506776f421 (diff) | |
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>
Diffstat (limited to 'arch/arm64/boot')
| -rw-r--r-- | arch/arm64/boot/dts/freescale/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8mq-evk-hdmi.dts | 50 | ||||
| -rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 43 |
3 files changed, 43 insertions, 52 deletions
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index 87abfbaa7480..0362743debf7 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -36,7 +36,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mq-hummingboard-pulse.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mq-librem5-devkit.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mq-nitrogen.dtb dtb-$(CONFIG_ARCH_MXC) += imx8mq-pico-pi.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 index 48e900341568..000000000000 --- 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 761aa81087ff..f6729e203991 100755 --- a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts +++ b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts @@ -126,6 +126,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"; @@ -163,7 +179,6 @@ audio-codec = <&ak4497>; status = "disabled"; }; - }; &A53_0 { @@ -1054,3 +1069,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>; + }; + }; +}; |