From: Chen-Yu Tsai <wens@csie.org>
Date: Thu, 24 Nov 2016 06:43:38 +0000 (+0800)
Subject: ARM: dts: sun6i: Disable display pipeline by default
X-Git-Tag: v4.10-rc5~19^2~7^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=205ac7b33e556bde7e3374042b4ca9989e245d89;p=karo-tx-linux.git

ARM: dts: sun6i: Disable display pipeline by default

While we now support the internal display pipeline found on sun6i, it
is possible that we are unable to enable the display for some boards,
due to a lack of drivers for the panels or bridges found on them. If
the display pipeline is enabled, the driver will try to enable, and
possibly screw up the simple framebuffer U-boot had configured.

Disable the display pipeline by default.

Fixes: 6d0e5b70be13 ("ARM: dts: sun6i: Add device nodes for first
		      display pipeline")
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---

diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index 2b26175d55d1..e78faaf9243c 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -234,6 +234,7 @@
 	de: display-engine {
 		compatible = "allwinner,sun6i-a31-display-engine";
 		allwinner,pipelines = <&fe0>;
+		status = "disabled";
 	};
 
 	soc@01c00000 {