arm64: dts: rk3399: dual display for hdmi and dp

hdmi connect vopb and dp connect vopl

Change-Id: Ib6a4771ab86ebe5dbfc21d1401e6768bcac7d36b
Signed-off-by: xubilv <xbl@rock-chips.com>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi
index dd773cb7b4cd041985e9eb24330b08a0e752eb8a..a5db61a6af15b30e1ffdef3e449d6c9886f027a7 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi
@@ -273,7 +273,7 @@
                        logo,kernel = "logo_kernel.bmp";
                        logo,mode = "fullscreen";
                        charge_logo,mode = "center";
-                       connect = <&vopl_out_hdmi>;
+                       connect = <&vopb_out_hdmi>;
                };
 
                route_mipi: route-mipi {

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev1-next.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1-next.dts
index a824f2f3a0136fda0adf0a2d13870b44b8e3d419..12af2fa2f35f1a7ada3d7aaa61d88f430a5c2244 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-box-rev1-next.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev1-next.dts
@@ -119,3 +119,34 @@
                status = "okay";
        };
 };
+
+&hdmi {
+       ports {
+               hdmi_in: port {
+                       /delete-node/ endpoint@1;
+               };
+       };
+};
+
+&cdn_dp {
+       status = "okay";
+       extcon = <&fusb0>;
+
+       ports {
+               dp_in: port {
+                       /delete-node/ endpoint@0;
+               };
+       };
+};
+
+&vopb {
+       vopb_out: port {
+               /delete-node/ endpoint@3;
+       };
+};
+
+&vopl {
+       vopl_out: port {
+               /delete-node/ endpoint@2;
+       };
+};

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-rev2-next.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2-next.dts
index c89982656dd23bceb430e1aa1fed81d07aaa95a7..96bd210fc9558ca38b003fa194f8d1e953bc3faa 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-box-rev2-next.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box-rev2-next.dts
@@ -127,6 +127,37 @@
        };
 };
 
+&hdmi {
+       ports {
+               hdmi_in: port {
+                       /delete-node/ endpoint@1;
+               };
+       };
+};
+
+&cdn_dp {
+       status = "okay";
+       extcon = <&fusb0>;
+
+       ports {
+               dp_in: port {
+                       /delete-node/ endpoint@0;
+               };
+       };
+};
+
+&vopb {
+       vopb_out: port {
+               /delete-node/ endpoint@3;
+       };
+};
+
+&vopl {
+       vopl_out: port {
+               /delete-node/ endpoint@2;
+       };
+};
+
 &vdd_cpu_b {
        vsel-gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;
        fcs,suspend-voltage-selector = <0>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 29f92788cd8e428677c6dcb3e2678b94abac99b0..9a6aface98baa49e4f6475d2ea8d5b7df90aa4b5 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1824,8 +1824,6 @@
                reg-io-width = <4>;
                rockchip,grf = <&grf>;
                power-domains = <&power RK3399_PD_HDCP>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&hdmi_i2c_xfer>;
                interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH 0>;
                clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_SFR>, <&cru SCLK_HDMI_SFR>, <&cru PCLK_EDP_CTRL>;
                clock-names = "iahb", "isfr", "vpll", "grf";