summaryrefslogtreecommitdiffstats
path: root/arch/arm/dts/rk3288-jerry.dts
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-21 19:45:19 -0700
committerSimon Glass <sjg@chromium.org>2016-01-21 20:42:37 -0700
commit74336f7daa4b1a45d04ddc9ef05737af54ae4836 (patch)
tree8ea22373c70d7eb6e16e27fc25a2e7ca2f18a672 /arch/arm/dts/rk3288-jerry.dts
parentd78a3d20456a4e9fdb93e8f01b26cfdb6f4c206b (diff)
downloadblackbird-obmc-uboot-74336f7daa4b1a45d04ddc9ef05737af54ae4836.tar.gz
blackbird-obmc-uboot-74336f7daa4b1a45d04ddc9ef05737af54ae4836.zip
rockchip: jerry: Enable EDP and HDMI video output
Enable these devices using the VOPL video output device. We explicitly disable VOPB in the device tree to avoid it taking over. Since this device has an LCD display this comes up by default. If the display fails for some reason then it will attempt to use HDMI. It is possible to force it to fail (and thus fall back to HDMI) by puting 'return -EPERM' at the top of rk_edp_probe(). For now there is no easy way to select between the two. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/dts/rk3288-jerry.dts')
-rw-r--r--arch/arm/dts/rk3288-jerry.dts5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/dts/rk3288-jerry.dts b/arch/arm/dts/rk3288-jerry.dts
index da37ea8e7a..2aa3b9f971 100644
--- a/arch/arm/dts/rk3288-jerry.dts
+++ b/arch/arm/dts/rk3288-jerry.dts
@@ -108,6 +108,11 @@
pinctrl-0 = <&vcc50_hdmi_en>;
};
+&vopb {
+ /* Disable this so that we use vopl */
+ status = "disabled";
+};
+
&edp {
pinctrl-names = "default";
pinctrl-0 = <&edp_hpd>;
OpenPOWER on IntegriCloud