diff --git a/arch/arm64/boot/dts/rockchip/px30-android.dtsi b/arch/arm64/boot/dts/rockchip/px30-android.dtsi index 98a94a448518..3f296c44e5dd 100644 --- a/arch/arm64/boot/dts/rockchip/px30-android.dtsi +++ b/arch/arm64/boot/dts/rockchip/px30-android.dtsi @@ -58,7 +58,6 @@ &display_subsystem { status = "disabled"; - ports = <&vopb_out>, <&vopl_out>; logo-memory-region = <&drm_logo>; route { diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi index 9e7f1ea419a9..d3606248dc46 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi @@ -245,10 +245,6 @@ status = "okay"; }; -&dsi_in_vopl { - status = "disabled"; -}; - &route_dsi { connect = <&vopb_out_dsi>; status = "okay"; @@ -800,14 +796,6 @@ status = "okay"; }; -&vopl { - status = "okay"; -}; - -&vopl_mmu { - status = "okay"; -}; - &mpp_srv { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi index fbadb5259adc..2413fe868b92 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi @@ -304,10 +304,6 @@ status = "okay"; }; -&dsi_in_vopl { - status = "disabled"; -}; - &route_dsi { connect = <&vopb_out_dsi>; status = "okay"; @@ -846,14 +842,6 @@ status = "okay"; }; -&vopl { - status = "okay"; -}; - -&vopl_mmu { - status = "okay"; -}; - &mpp_srv { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi index 623431e2e355..6ba60b41291b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3326-linux.dtsi @@ -48,7 +48,6 @@ &display_subsystem { status = "disabled"; - ports = <&vopb_out>, <&vopl_out>; logo-memory-region = <&drm_logo>; route { diff --git a/arch/arm64/boot/dts/rockchip/rk3326.dtsi b/arch/arm64/boot/dts/rockchip/rk3326.dtsi index fdb000c14038..004bda94a955 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3326.dtsi @@ -10,6 +10,10 @@ assigned-clock-rates = <1040000000>; }; +&display_subsystem { + ports = <&vopb_out>; +}; + &gpu_opp_table { opp-520000000 { opp-hz = /bits/ 64 <520000000>; @@ -76,3 +80,9 @@ }; }; }; + +/delete-node/ &dsi_in_vopl; +/delete-node/ &lvds_vopl_in; +/delete-node/ &rgb_in_vopl; +/delete-node/ &vopl; +/delete-node/ &vopl_mmu;