From 4c48b468d07202eba0e3f7ceef2b6724611d273e Mon Sep 17 00:00:00 2001 From: Guochun Huang Date: Wed, 17 Feb 2021 17:18:15 +0800 Subject: [PATCH] arm64: dts: rockchip: rk356x evb: dsi0 is mounted on vp1 by default Change-Id: I4a1d2c8842dcd4880380962c952a6ba13ad8919d Signed-off-by: Guochun Huang --- arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi | 5 +++-- arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi | 5 +++-- arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi | 5 +++-- arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi | 5 +++-- arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts | 7 +++++-- arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi | 5 +++-- arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi | 5 +++-- arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi | 5 +++-- arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi | 5 +++-- 9 files changed, 29 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi index 3a5a7dbe305b..a0b9cc1c5788 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi @@ -164,11 +164,11 @@ }; &dsi0_in_vp0 { - status = "okay"; + status = "disabled"; }; &dsi0_in_vp1 { - status = "disabled"; + status = "okay"; }; &dsi0_panel { @@ -401,6 +401,7 @@ &route_dsi0 { status = "okay"; + connect = <&vp1_out_dsi0>; }; &sdmmc2 { diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi index 4b40416ae1a9..ec4a8202976c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi @@ -175,11 +175,11 @@ }; &dsi0_in_vp0 { - status = "okay"; + status = "disabled"; }; &dsi0_in_vp1 { - status = "disabled"; + status = "okay"; }; &dsi0_panel { @@ -523,6 +523,7 @@ &route_dsi0 { status = "okay"; + connect = <&vp1_out_dsi0>; }; &sdmmc2 { diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi index 6ac2b2dd4c36..0b6bd82ea412 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi @@ -96,11 +96,11 @@ }; &dsi0_in_vp0 { - status = "okay"; + status = "disabled"; }; &dsi0_in_vp1 { - status = "disabled"; + status = "okay"; }; &dsi0_panel { @@ -425,6 +425,7 @@ &route_dsi0 { status = "okay"; + connect = <&vp1_out_dsi0>; }; &sata1 { diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi index d6856a248998..7cb4dc8de4fb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi @@ -72,14 +72,15 @@ */ &dsi0 { status = "okay"; + connect = <&vp1_out_dsi0>; }; &dsi0_in_vp0 { - status = "okay"; + status = "disabled"; }; &dsi0_in_vp1 { - status = "disabled"; + status = "okay"; }; &dsi0_panel { diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts index 309ae7c40074..e3fd5b6a6756 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts @@ -448,11 +448,11 @@ }; &dsi0_in_vp0 { - status = "okay"; + status = "disabled"; }; &dsi0_in_vp1 { - status = "disabled"; + status = "okay"; }; &gpu { @@ -1093,6 +1093,7 @@ &route_dsi0 { status = "okay"; + connect = <&vp1_out_dsi0>; }; &saradc { @@ -1185,6 +1186,8 @@ &vop { status = "okay"; + assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>; + assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>; }; &vop_mmu { diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi index b03c788f2861..05d0afd391a5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi @@ -160,11 +160,11 @@ }; &dsi0_in_vp0 { - status = "okay"; + status = "disabled"; }; &dsi0_in_vp1 { - status = "disabled"; + status = "okay"; }; &dsi0_panel { @@ -422,6 +422,7 @@ &route_dsi0 { status = "okay"; + connect = <&vp1_out_dsi0>; }; &sata2 { diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi index d7c15d63eb29..571f7bcf3d6a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi @@ -106,11 +106,11 @@ }; &dsi0_in_vp0 { - status = "okay"; + status = "disabled"; }; &dsi0_in_vp1 { - status = "disabled"; + status = "okay"; }; &dsi0_panel { @@ -417,6 +417,7 @@ &route_dsi0 { status = "okay"; + connect = <&vp1_out_dsi0>; }; &sdio_pwrseq { diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi index 77a5c80b85af..40a3701aa100 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi @@ -173,11 +173,11 @@ }; &dsi0_in_vp0 { - status = "okay"; + status = "disabled"; }; &dsi0_in_vp1 { - status = "disabled"; + status = "okay"; }; &dsi0_panel { @@ -493,6 +493,7 @@ &route_dsi0 { status = "okay"; + connect = <&vp1_out_dsi0>; }; &sata2 { diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi index 411cf59e4a5e..1dd3f3a6e274 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi @@ -117,11 +117,11 @@ }; &dsi0_in_vp0 { - status = "okay"; + status = "disabled"; }; &dsi0_in_vp1 { - status = "disabled"; + status = "okay"; }; &dsi0_panel { @@ -391,6 +391,7 @@ &route_dsi0 { status = "okay"; + connect = <&vp1_out_dsi0>; }; &sdmmc1 {