From fbc159156c90bee7dd0c4aa1dd335f74770d1b17 Mon Sep 17 00:00:00 2001 From: Guochun Huang Date: Thu, 24 Jun 2021 18:14:17 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3568: rename mipi_dphy to video_phy Signed-off-by: Guochun Huang Change-Id: Ie019c9d27e06328d45920d41c0a065f8bc47588f --- arch/arm64/boot/dts/rockchip/rk3566-box.dtsi | 4 +- .../dts/rockchip/rk3566-evb-mipitest-v10.dtsi | 8 ++-- .../rockchip/rk3566-evb1-ddr4-v10-lvds.dts | 8 ---- .../dts/rockchip/rk3566-evb1-ddr4-v10.dtsi | 8 ++-- .../rockchip/rk3566-evb2-lp4x-v10-eink.dts | 2 +- .../dts/rockchip/rk3566-evb2-lp4x-v10.dtsi | 10 ++--- .../dts/rockchip/rk3566-evb3-ddr3-v10.dtsi | 8 ++-- .../dts/rockchip/rk3566-evb5-lp4x-v10.dtsi | 8 ++-- .../dts/rockchip/rk3566-rk817-eink-w103.dts | 2 +- .../dts/rockchip/rk3566-rk817-eink-w6.dts | 2 +- .../boot/dts/rockchip/rk3566-rk817-eink.dts | 2 +- .../dts/rockchip/rk3566-rk817-tablet-k108.dts | 2 +- .../rockchip/rk3566-rk817-tablet-rkg11.dts | 4 +- .../dts/rockchip/rk3566-rk817-tablet-v10.dts | 2 +- .../boot/dts/rockchip/rk3566-rk817-tablet.dts | 2 +- .../dts/rockchip/rk3568-evb1-ddr4-v10.dtsi | 8 ++-- .../rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts | 2 +- .../dts/rockchip/rk3568-evb2-lp4x-v10.dtsi | 8 ++-- .../dts/rockchip/rk3568-evb5-ddr4-v10.dtsi | 8 ++-- ...568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts | 2 +- .../dts/rockchip/rk3568-evb6-ddr3-v10.dtsi | 8 ++-- arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi | 4 +- arch/arm64/boot/dts/rockchip/rk3568.dtsi | 39 ++++++------------- 23 files changed, 64 insertions(+), 87 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi index 7818060dcc0f..bc7f618602ef 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi @@ -246,11 +246,11 @@ status = "okay"; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; -&mipi_dphy1 { +&video_phy1 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi index 4f5547faf24b..77ecad88f4ec 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb-mipitest-v10.dtsi @@ -155,7 +155,7 @@ }; /* - * mipi_dphy0 needs to be enabled + * video_phy0 needs to be enabled * when dsi0 is enabled */ &dsi0 { @@ -178,7 +178,7 @@ }; /* - * mipi_dphy1 needs to be enabled + * video_phy1 needs to be enabled * when dsi1 is enabled */ &dsi1 { @@ -321,11 +321,11 @@ }; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; -&mipi_dphy1 { +&video_phy1 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts index 390ba4c80997..98a384041b8b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10-lvds.dts @@ -97,11 +97,3 @@ status = "okay"; connect = <&vp1_out_lvds>; }; - -&mipi_dphy0 { - status = "disabled"; -}; - -&mipi_dphy1 { - status = "disabled"; -}; 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 913aff5e2614..c43a63708ac4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb1-ddr4-v10.dtsi @@ -155,7 +155,7 @@ }; /* - * mipi_dphy0 needs to be enabled + * video_phy0 needs to be enabled * when dsi0 is enabled */ &dsi0 { @@ -178,7 +178,7 @@ }; /* - * mipi_dphy1 needs to be enabled + * video_phy1 needs to be enabled * when dsi1 is enabled */ &dsi1 { @@ -316,11 +316,11 @@ }; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; -&mipi_dphy1 { +&video_phy1 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts index 2faa4e6803ce..83546eef6529 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10-eink.dts @@ -285,7 +285,7 @@ }; }; -&mipi_dphy0 { +&video_phy0 { status = "disabled"; }; 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 a23339548302..e4805605ebf0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb2-lp4x-v10.dtsi @@ -7,6 +7,7 @@ /dts-v1/; #include +#include #include #include "rk3566.dtsi" #include "rk3566-evb.dtsi" @@ -166,7 +167,7 @@ }; /* - * mipi_dphy0 needs to be enabled + * video_phy0 needs to be enabled * when dsi0 is enabled */ &dsi0 { @@ -189,7 +190,7 @@ }; /* - * mipi_dphy1 needs to be enabled + * video_phy1 needs to be enabled * when dsi1 is enabled */ &dsi1 { @@ -405,11 +406,11 @@ }; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; -&mipi_dphy1 { +&video_phy1 { status = "disabled"; }; @@ -594,4 +595,3 @@ BT,wake_host_irq = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; status = "okay"; }; - 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 99b59f98be45..74cd0915056b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb3-ddr3-v10.dtsi @@ -88,7 +88,7 @@ }; /* - * mipi_dphy0 needs to be enabled + * video_phy0 needs to be enabled * when dsi0 is enabled */ &dsi0 { @@ -111,7 +111,7 @@ }; /* - * mipi_dphy1 needs to be enabled + * video_phy1 needs to be enabled * when dsi1 is enabled */ &dsi1 { @@ -283,11 +283,11 @@ }; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; -&mipi_dphy1 { +&video_phy1 { status = "disabled"; }; 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 e9cb9c23ba61..8e0d808e6a89 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-evb5-lp4x-v10.dtsi @@ -66,7 +66,7 @@ }; /* - * mipi_dphy0 needs to be enabled + * video_phy0 needs to be enabled * when dsi0 is enabled */ &dsi0 { @@ -90,7 +90,7 @@ }; /* - * mipi_dphy1 needs to be enabled + * video_phy1 needs to be enabled * when dsi1 is enabled */ &dsi1 { @@ -179,11 +179,11 @@ }; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; -&mipi_dphy1 { +&video_phy1 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts index a72bfe1ec459..45a9e8312eea 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w103.dts @@ -844,7 +844,7 @@ status = "okay"; }; -&mipi_dphy0 { +&video_phy0 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts index 27d3c69b6355..03801d5dff0e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink-w6.dts @@ -698,7 +698,7 @@ status = "okay"; }; -&mipi_dphy0 { +&video_phy0 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts index b0216ae1583e..3fadfaec8e51 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts @@ -714,7 +714,7 @@ status = "okay"; }; -&mipi_dphy0 { +&video_phy0 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts index cb1ae9d2546c..22a5459329da 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-k108.dts @@ -991,7 +991,7 @@ status = "okay"; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts index d10c0bb3989b..2540354c1a5c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts @@ -893,11 +893,11 @@ status = "okay"; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; -&mipi_dphy1 { +&video_phy1 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts index ca412b19378c..32601e463df4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.dts @@ -921,7 +921,7 @@ status = "okay"; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts index ebb0feecbe02..eef06d5b4a62 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts @@ -926,7 +926,7 @@ status = "okay"; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; 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 69d5d7e1e980..dc847d0ab9ed 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi @@ -152,7 +152,7 @@ }; /* - * mipi_dphy0 needs to be enabled + * video_phy0 needs to be enabled * when dsi0 is enabled */ &dsi0 { @@ -172,7 +172,7 @@ }; /* - * mipi_dphy1 needs to be enabled + * video_phy1 needs to be enabled * when dsi1 is enabled */ &dsi1 { @@ -354,11 +354,11 @@ }; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; -&mipi_dphy1 { +&video_phy1 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts index eddea1dd9148..7a5a7feb52a7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10-bt1120-to-hdmi.dts @@ -45,7 +45,7 @@ }; }; -&mipi_dphy0 { +&video_phy0 { status = "disabled"; }; 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 505d01779c48..b3fbc7d80b43 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb2-lp4x-v10.dtsi @@ -77,7 +77,7 @@ }; /* - * mipi_dphy0 needs to be enabled + * video_phy0 needs to be enabled * when dsi0 is enabled */ &dsi0 { @@ -97,7 +97,7 @@ }; /* - * mipi_dphy1 needs to be enabled + * video_phy1 needs to be enabled * when dsi1 is enabled */ &dsi1 { @@ -201,11 +201,11 @@ }; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; -&mipi_dphy1 { +&video_phy1 { status = "disabled"; }; 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 1a7ebb1ed1e9..651d4c1fcb5b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb5-ddr4-v10.dtsi @@ -165,7 +165,7 @@ }; /* - * mipi_dphy0 needs to be enabled + * video_phy0 needs to be enabled * when dsi0 is enabled */ &dsi0 { @@ -185,7 +185,7 @@ }; /* - * mipi_dphy1 needs to be enabled + * video_phy1 needs to be enabled * when dsi1 is enabled */ &dsi1 { @@ -397,11 +397,11 @@ }; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; -&mipi_dphy1 { +&video_phy1 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts index d5251a5fc17a..106e85c07eb4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10-rk628-bt1120-to-hdmi.dts @@ -24,7 +24,7 @@ }; }; -&mipi_dphy0 { +&video_phy0 { status = "disabled"; }; 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 b8110a505c62..9fac596bc732 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb6-ddr3-v10.dtsi @@ -77,7 +77,7 @@ }; /* - * mipi_dphy0 needs to be enabled + * video_phy0 needs to be enabled * when dsi0 is enabled */ &dsi0 { @@ -97,7 +97,7 @@ }; /* - * mipi_dphy1 needs to be enabled + * video_phy1 needs to be enabled * when dsi1 is enabled */ &dsi1 { @@ -287,11 +287,11 @@ }; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; -&mipi_dphy1 { +&video_phy1 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi index b222f4107258..7697ee16ad64 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi @@ -305,11 +305,11 @@ status = "okay"; }; -&mipi_dphy0 { +&video_phy0 { status = "okay"; }; -&mipi_dphy1 { +&video_phy1 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi index f7ef831fc3d7..55bdc827bde4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -1808,11 +1808,11 @@ compatible = "rockchip,rk3568-mipi-dsi"; reg = <0x0 0xfe060000 0x0 0x10000>; interrupts = ; - clocks = <&cru PCLK_DSITX_0>, <&cru HCLK_VO>, <&mipi_dphy0>; + clocks = <&cru PCLK_DSITX_0>, <&cru HCLK_VO>, <&video_phy0>; clock-names = "pclk", "hclk", "hs_clk"; resets = <&cru SRST_P_DSITX_0>; reset-names = "apb"; - phys = <&mipi_dphy0>; + phys = <&video_phy0>; phy-names = "mipi_dphy"; power-domains = <&power RK3568_PD_VO>; rockchip,grf = <&grf>; @@ -1848,11 +1848,11 @@ compatible = "rockchip,rk3568-mipi-dsi"; reg = <0x0 0xfe070000 0x0 0x10000>; interrupts = ; - clocks = <&cru PCLK_DSITX_1>, <&cru HCLK_VO>, <&mipi_dphy1>; + clocks = <&cru PCLK_DSITX_1>, <&cru HCLK_VO>, <&video_phy1>; clock-names = "pclk", "hclk", "hs_clk"; resets = <&cru SRST_P_DSITX_1>; reset-names = "apb"; - phys = <&mipi_dphy1>; + phys = <&video_phy1>; phy-names = "mipi_dphy"; power-domains = <&power RK3568_PD_VO>; rockchip,grf = <&grf>; @@ -3281,21 +3281,6 @@ status = "disabled"; }; - mipi_dphy0: mipi-dphy@fe850000 { - compatible = "rockchip,rk3568-mipi-dphy"; - reg = <0x0 0xfe850000 0x0 0x10000>; - clocks = <&pmucru CLK_MIPIDSIPHY0_REF>, <&cru PCLK_MIPIDSIPHY0>; - clock-names = "ref", "pclk"; - clock-output-names = "mipi_dphy_pll"; - #clock-cells = <0>; - resets = <&cru SRST_P_MIPIDSIPHY0>; - reset-names = "apb"; - power-domains = <&power RK3568_PD_VO>; - #phy-cells = <0>; - rockchip,grf = <&grf>; - status = "disabled"; - }; - video_phy0: video-phy@fe850000 { compatible = "rockchip,rk3568-video-phy"; reg = <0x0 0xfe850000 0x0 0x10000>, @@ -3311,18 +3296,18 @@ status = "disabled"; }; - mipi_dphy1: mipi-dphy@fe860000 { - compatible = "rockchip,rk3568-mipi-dphy"; - reg = <0x0 0xfe860000 0x0 0x10000>; - clocks = <&pmucru CLK_MIPIDSIPHY1_REF>, <&cru PCLK_MIPIDSIPHY1>; - clock-names = "ref", "pclk"; - clock-output-names = "mipi_dphy1_pll"; + video_phy1: video-phy@fe860000 { + compatible = "rockchip,rk3568-video-phy"; + reg = <0x0 0xfe860000 0x0 0x10000>, + <0x0 0xfe070000 0x0 0x10000>; + clocks = <&pmucru CLK_MIPIDSIPHY1_REF>, + <&cru PCLK_MIPIDSIPHY1>, <&cru PCLK_DSITX_1>; + clock-names = "ref", "pclk_phy", "pclk_host"; #clock-cells = <0>; resets = <&cru SRST_P_MIPIDSIPHY1>; - reset-names = "apb"; + reset-names = "rst"; power-domains = <&power RK3568_PD_VO>; #phy-cells = <0>; - rockchip,grf = <&grf>; status = "disabled"; };