diff options
author | Chen-Yu Tsai <wens@csie.org> | 2017-04-21 10:38:57 +0200 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-05-14 08:32:33 +0200 |
commit | f89f2a37cc52d13e94c91e134055a9d70c4b6690 (patch) | |
tree | 4dbe135c020ff3c6a8820ca36286222854e4232e /arch/arm | |
parent | ARM: dts: sun6i: Add second display pipeline device nodes (diff) | |
download | linux-f89f2a37cc52d13e94c91e134055a9d70c4b6690.tar.xz linux-f89f2a37cc52d13e94c91e134055a9d70c4b6690.zip |
ARM: dts: sun6i: Enable tcon0 by default
tcon0 contains a muxing register used to mux tcon output to downstream
hdmi or mipi dsi encoders. tcon0 must be available for the mux to be
configured.
Whether the display subsystem is enabled or not is now solely controlled
by the display-engine node.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/sun6i-a31.dtsi | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts index b4c87a23e3f8..55607208468b 100644 --- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts +++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts @@ -319,7 +319,6 @@ &tcon0 { pinctrl-names = "default"; pinctrl-0 = <&lcd0_rgb888_pins>; - status = "okay"; }; &tcon0_out { diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index dfcf64515d7f..d0cede5aaeb5 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -264,7 +264,6 @@ "tcon-ch0", "tcon-ch1"; clock-output-names = "tcon0-pixel-clock"; - status = "disabled"; ports { #address-cells = <1>; |