From 4cb2b501c2ad52c633b22a338ce9e6802dabf2d9 Mon Sep 17 00:00:00 2001 From: Liu Ying Date: Wed, 3 May 2017 10:16:48 +0800 Subject: [PATCH] MLK-14780 ARM: dtsi: imx6qdl-sabresd: Set HDMI's DI from 1 back to 0 To keep backward compatibility of the default device tree settings, we should set HDMI's display interface to be DI0 of IPU0. This makes HDMI and MIPI DSI be able to work simultaneously on the i.MX6q/qp sabresd platform. Also, LVDS1 and HDMI on the i.MX6sdl sabresd platform. So, let's revert "MLK-14678: dts: Fix lcd display id" (commit 85073fc130e83a1cfba58f0f06d9d8cbbd8c88f4). Signed-off-by: Liu Ying --- arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi index fb4151050278..e8861ab3cd2e 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi @@ -351,7 +351,7 @@ &hdmi_core { ipu_id = <0>; - disp_id = <1>; + disp_id = <0>; status = "okay"; }; -- 2.17.1