summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>2017-06-12 15:47:21 +0200
committerKlaus Goger <klaus.goger@theobroma-systems.com>2017-06-13 07:52:05 +0200
commite76884fb1ab60e52abe5598c4ca5d3f236cd9b8a (patch)
tree6f9f0113cffb112aa513933ee2646d052c398463
parentea19c9ddc33302561b20a1d6a3afe38fdb53c2c2 (diff)
arm64: rk3399-puma-edp.dts: fix edp output by enabling vopl
vopl was disabled when the base dts switched to vopb, but this broke edp output. Re-enable vopl here. Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com>
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-puma-edp.dts12
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-puma-hdmi+edp.dts49
2 files changed, 8 insertions, 53 deletions
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-edp.dts
index 484fcfda28b5..25d506659176 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma-edp.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-edp.dts
@@ -26,6 +26,13 @@
};
};
+&vopl {
+ status = "okay";
+};
+&vopl_mmu {
+ status = "okay";
+};
+
&edp {
status = "okay";
ports {
@@ -53,8 +60,3 @@
&route_edp {
status = "okay";
};
-
-// TODO: test if this is really needed, then delete it.
-&edp_in_vopb {
- status = "enabled";
-};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-hdmi+edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-hdmi+edp.dts
index be55d85a07ee..2405e21c6e3a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma-hdmi+edp.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-hdmi+edp.dts
@@ -1,46 +1,7 @@
/*
* Theobroma Systems RK3399-Q7 "Puma" with EDP and HDMI enabled
*/
-#include "rk3399-puma.dts"
-
-/ {
- edp_panel: edp_panel {
- // The "auo,b133htn01" is a 1920x1080x60hz panel with timings that seem to work fine
- // on external DisplayPort monitors.
- // See drivers/gpu/drm/panel/panel-simple.c for how to define custom panels.
- //compatible = "auo,b133htn01", "panel-simple";
- // Generic 1920x1200x60Hz definition that works well for an Iiyama PL2485W monitor
- // connected via DisplayPort.
- compatible = "generic,1920x1200x60", "panel-simple";
- // The enable gpio is used to switch the hardware multiplexer (U29) to DisplayPort.
- enable-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; // GPIO2_A2 = SEL_EDP_1V8
- //backlight = <&backlight>;
- //power-supply = <&vcc3v3_s0>;
- //pinctrl-names = "default";
- //pinctrl-0 = <&lcd_panel_reset>;
- ports {
- panel_in_edp: endpoint {
- remote-endpoint = <&edp_out_panel>;
- };
- };
- };
-};
-
-&edp {
- status = "okay";
- ports {
- edp_out: port@1 {
- reg = <1>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- edp_out_panel: endpoint@0 {
- reg = <0>;
- remote-endpoint = <&panel_in_edp>;
- };
- };
- };
-};
+#include "rk3399-puma-edp.dts"
&hdmi {
status = "okay";
@@ -49,11 +10,3 @@
&route_hdmi {
status = "okay";
};
-
-&route_edp {
- status = "okay";
-};
-
-&edp_in_vopl {
- status = "enabled";
-};