From fa8043229337af2e8868967efd79370f53a66042 Mon Sep 17 00:00:00 2001 From: xubilv Date: Fri, 30 Dec 2016 19:29:40 +0800 Subject: [PATCH] arm64: dts: rk3399: dual display for hdmi and dp hdmi connect vopb and dp connect vopl Change-Id: Ib6a4771ab86ebe5dbfc21d1401e6768bcac7d36b Signed-off-by: xubilv --- .../dts/rockchip/rk3399-android-next.dtsi | 2 +- .../dts/rockchip/rk3399-box-rev1-next.dts | 31 +++++++++++++++++++ .../dts/rockchip/rk3399-box-rev2-next.dts | 31 +++++++++++++++++++ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 -- 4 files changed, 63 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android-next.dtsi index dd773cb7b4cd..a5db61a6af15 100644 --- 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 a824f2f3a013..12af2fa2f35f 100644 --- 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 c89982656dd2..96bd210fc955 100644 --- 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 29f92788cd8e..9a6aface98ba 100644 --- 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 = ; clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_SFR>, <&cru SCLK_HDMI_SFR>, <&cru PCLK_EDP_CTRL>; clock-names = "iahb", "isfr", "vpll", "grf"; -- 2.34.1