diff --git a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi index 51bb4e6a4328..b1361da6c5fe 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi @@ -138,7 +138,7 @@ logo,kernel = "logo_kernel.bmp"; logo,mode = "center"; charge_logo,mode = "center"; - connect = <&vopb_out_mipi>; + connect = <&vopb_out_dsi>; }; route_edp: route-edp { diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 349f01a7234b..8a0d811c21cd 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1763,9 +1763,9 @@ #address-cells = <1>; #size-cells = <0>; - vopl_out_mipi: endpoint@0 { + vopl_out_dsi: endpoint@0 { reg = <0>; - remote-endpoint = <&mipi_in_vopl>; + remote-endpoint = <&dsi_in_vopl>; }; vopl_out_edp: endpoint@1 { @@ -1839,9 +1839,9 @@ remote-endpoint = <&edp_in_vopb>; }; - vopb_out_mipi: endpoint@1 { + vopb_out_dsi: endpoint@1 { reg = <1>; - remote-endpoint = <&mipi_in_vopb>; + remote-endpoint = <&dsi_in_vopb>; }; vopb_out_hdmi: endpoint@2 { @@ -1996,7 +1996,7 @@ }; }; - mipi_dsi: mipi@ff960000 { + dsi: dsi@ff960000 { compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi"; reg = <0x0 0xff960000 0x0 0x8000>; interrupts = ; @@ -2010,21 +2010,18 @@ status = "disabled"; ports { - #address-cells = <1>; - #size-cells = <0>; - - mipi_in: port@0 { - reg = <0>; + port { #address-cells = <1>; #size-cells = <0>; - mipi_in_vopb: endpoint@0 { + dsi_in_vopb: endpoint@0 { reg = <0>; - remote-endpoint = <&vopb_out_mipi>; + remote-endpoint = <&vopb_out_dsi>; }; - mipi_in_vopl: endpoint@1 { + + dsi_in_vopl: endpoint@1 { reg = <1>; - remote-endpoint = <&vopl_out_mipi>; + remote-endpoint = <&vopl_out_dsi>; }; }; };