summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2016-11-24 07:43:38 +0100
committerMaxime Ripard <maxime.ripard@free-electrons.com>2017-01-10 18:32:07 +0100
commit205ac7b33e556bde7e3374042b4ca9989e245d89 (patch)
tree1e99687f48d7f48842d772e687261b59d10d5ee4 /arch
parentLinux 4.10-rc1 (diff)
downloadlinux-205ac7b33e556bde7e3374042b4ca9989e245d89.tar.xz
linux-205ac7b33e556bde7e3374042b4ca9989e245d89.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/sun6i-a31.dtsi1
1 files changed, 1 insertions, 0 deletions
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 {