From: Yakir Yang <ykk@rock-chips.com>
Date: Fri, 22 Apr 2016 09:51:39 +0000 (+0800)
Subject: Revert "ARM64: dts: rk3399: gru: Let VOP Big first to select connector device"
X-Git-Tag: firefly_0821_release~2748
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=62b22bf6a9e259e902f3f52308b5dfbf573660b7;p=firefly-linux-kernel-4.4.55.git

Revert "ARM64: dts: rk3399: gru: Let VOP Big first to select connector device"

We must not to adjust the port order, cause the port id is mapping
to VOP type. Current driver just hardcode that VOP Lit is ID 0, and
VOP Big is ID 1.

        ret = rockchip_drm_encoder_get_mux_id(dp->dev->of_node, encoder);
        if (ret)
                val = dp->data->lcdsel_lit | dp->data->lcdsel_mask;
        else
                val = dp->data->lcdsel_big | dp->data->lcdsel_mask;

Besides eDP could work well with VOP Lit, so we need to revert this
hack. Just revert commit 602f4f79c8f2a833069cd32cb0cc80984e6febb6.

Change-Id: I69badf2860c83c8211ea23b9f490fd4837dcf22e
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
---

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index 8e06f84f7899..fa649dc9b554 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -884,7 +884,6 @@ ap_i2c_audio: &i2c8 {
 
 &display_subsystem {
 	status = "okay";
-	ports = <&vopb_out>, <&vopl_out>;
 };
 
 &gpu {