From 2db29d7f51e1c4e0317e22bb3e1a49feab9ef870 Mon Sep 17 00:00:00 2001 From: Wyon Bi Date: Mon, 29 Nov 2021 16:51:49 +0800 Subject: [PATCH] arm64: dts: rockchip: Remove assigned-clocks from vop node for rk3588 boards Change-Id: I20d568eb199d34380a4b776742f111adcc3c35b3 Signed-off-by: Wyon Bi --- arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi | 8 -------- .../boot/dts/rockchip/rk3588-evb2-lp4-v10-edp.dts | 8 -------- .../dts/rockchip/rk3588-evb2-lp4-v10-edp2dp.dts | 8 -------- arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi | 8 -------- .../dts/rockchip/rk3588-evb3-lp5-v10-edp-linux.dts | 13 ------------- .../boot/dts/rockchip/rk3588-evb3-lp5-v10-edp.dts | 13 ------------- arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi | 9 --------- arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi | 8 -------- arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi | 3 --- 9 files changed, 78 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi index 4522f58a06fc..68b23c1b45f0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi @@ -628,11 +628,3 @@ &usbhost_dwc3_0 { status = "disabled"; }; - -&vop { - assigned-clocks = <&cru DCLK_VOP0_SRC>, - <&cru DCLK_VOP1_SRC>, - <&cru DCLK_VOP2_SRC>, - <&cru DCLK_VOP3>; - assigned-clock-parents = <0>, <0>, <&cru PLL_V0PLL>, <0>; -}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4-v10-edp.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4-v10-edp.dts index 0be57d4b10d9..a889cc3250f8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4-v10-edp.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4-v10-edp.dts @@ -135,11 +135,3 @@ &vcc3v3_lcd_n { /delete-property/ gpio; }; - -&vop { - assigned-clocks = <&cru DCLK_VOP0_SRC>, - <&cru DCLK_VOP1_SRC>, - <&cru DCLK_VOP2_SRC>, - <&cru DCLK_VOP3>; - assigned-clock-parents = <0>, <&cru PLL_GPLL>, <&cru PLL_V0PLL>, <0>; -}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4-v10-edp2dp.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4-v10-edp2dp.dts index 5a4a8e064082..112d8973f7a7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4-v10-edp2dp.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4-v10-edp2dp.dts @@ -59,11 +59,3 @@ &spdif_tx3 { status = "okay"; }; - -&vop { - assigned-clocks = <&cru DCLK_VOP0_SRC>, - <&cru DCLK_VOP1_SRC>, - <&cru DCLK_VOP2_SRC>, - <&cru DCLK_VOP3>; - assigned-clock-parents = <0>, <0>, <&cru PLL_V0PLL>, <0>; -}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi index 668d4c50e7c4..854569384fbf 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi @@ -480,11 +480,3 @@ gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; enable-active-high; }; - -&vop { - assigned-clocks = <&cru DCLK_VOP0_SRC>, - <&cru DCLK_VOP1_SRC>, - <&cru DCLK_VOP2_SRC>, - <&cru DCLK_VOP3>; - assigned-clock-parents = <0>, <0>, <&cru PLL_V0PLL>, <0>; -}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5-v10-edp-linux.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5-v10-edp-linux.dts index a410f665128e..964efd902861 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5-v10-edp-linux.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5-v10-edp-linux.dts @@ -108,16 +108,3 @@ &vcc3v3_lcd_n { /delete-property/ gpio; }; - -&vop { - assigned-clocks = <&cru DCLK_VOP0_SRC>, - <&cru DCLK_VOP1_SRC>, - <&cru DCLK_VOP2_SRC>, - <&cru DCLK_VOP3>; - assigned-clock-parents = <0>, <0>, <&cru PLL_V0PLL>, <0>; - status = "okay"; -}; - -&vop_mmu { - status = "okay"; -}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5-v10-edp.dts b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5-v10-edp.dts index d5f7ee867bb6..3890e1d26247 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5-v10-edp.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5-v10-edp.dts @@ -108,16 +108,3 @@ &vcc3v3_lcd_n { /delete-property/ gpio; }; - -&vop { - assigned-clocks = <&cru DCLK_VOP0_SRC>, - <&cru DCLK_VOP1_SRC>, - <&cru DCLK_VOP2_SRC>, - <&cru DCLK_VOP3>; - assigned-clock-parents = <0>, <0>, <&cru PLL_V0PLL>, <0>; - status = "okay"; -}; - -&vop_mmu { - status = "okay"; -}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi index 5827d0072a7d..75678f8cfd97 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi @@ -1172,12 +1172,3 @@ &usbhost_dwc3_0 { status = "disabled"; }; - -&vop { - assigned-clocks = <&cru DCLK_VOP0_SRC>, - <&cru DCLK_VOP1_SRC>, - <&cru DCLK_VOP2_SRC>, - <&cru DCLK_VOP3>; - assigned-clock-parents = <0>, <0>, <&cru PLL_V0PLL>, <0>; - status = "okay"; -}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi index 90124c2c90b5..b7a0103889e6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi @@ -501,11 +501,3 @@ &usbhost_dwc3_0 { status = "disabled"; }; - -&vop { - assigned-clocks = <&cru DCLK_VOP0_SRC>, - <&cru DCLK_VOP1_SRC>, - <&cru DCLK_VOP2_SRC>, - <&cru DCLK_VOP3>; - assigned-clock-parents = <0>, <0>, <&cru PLL_V0PLL>, <0>; -}; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi index b710163ce496..27a361243d4f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi @@ -1150,9 +1150,6 @@ }; &vop { - assigned-clocks = <&cru DCLK_VOP2_SRC>, <&cru DCLK_VOP2_SRC>, - <&cru DCLK_VOP2_SRC>, <&cru DCLK_VOP3>; - assigned-clock-parents = <0>, <&cru PLL_GPLL>, <&cru PLL_V0PLL>, <0>; status = "okay"; };