[PATCH v1] arm: dts: rockchip: rk3288: sort mipi hdmi lvds and dp nodes

[Kever Yang]

On 2022/5/2 18:19, Johan Jonker wrote:
> In order to better compare the Linux rk3288.dtsi version
> with the u-boot version sort the mipi,hdmi,lvds and dp nodes.
>
> Changed:
>    Rename mipi_dsi label.
>    Rename dp nodename.
>
> Signed-off-by: Johan Jonker <jbx6244 at gmail.com>

Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/dts/rk3288-evb.dtsi |   2 +-
>   arch/arm/dts/rk3288.dtsi     | 110 +++++++++++++++++------------------
>   2 files changed, 56 insertions(+), 56 deletions(-)
>
> diff --git a/arch/arm/dts/rk3288-evb.dtsi b/arch/arm/dts/rk3288-evb.dtsi
> index 04902c0b..72da8847 100644
> --- a/arch/arm/dts/rk3288-evb.dtsi
> +++ b/arch/arm/dts/rk3288-evb.dtsi
> @@ -448,7 +448,7 @@
>   	status = "okay";
>   };
>   
> -&mipi_dsi0 {
> +&mipi_dsi {
>   	status = "disabled";
>   	rockchip,panel = <&panel>;
>   	display-timings {
> diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
> index 0bfa4c39..469df94e 100644
> --- a/arch/arm/dts/rk3288.dtsi
> +++ b/arch/arm/dts/rk3288.dtsi
> @@ -709,54 +709,29 @@
>   		status = "disabled";
>   	};
>   
> -	edp: edp at ff970000 {
> -		compatible = "rockchip,rk3288-edp";
> -		reg = <0xff970000 0x4000>;
> -		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
> -		clocks = <&cru SCLK_EDP>, <&cru SCLK_EDP_24M>, <&cru PCLK_EDP_CTRL>;
> -		rockchip,grf = <&grf>;
> -		clock-names = "clk_edp", "clk_edp_24m", "pclk_edp";
> -		resets = <&cru 111>;
> -		reset-names = "edp";
> -		power-domains = <&power RK3288_PD_VIO>;
> -		status = "disabled";
> -		ports {
> -			edp_in: port {
> -				#address-cells = <1>;
> -				#size-cells = <0>;
> -				edp_in_vopb: endpoint at 0 {
> -					reg = <0>;
> -					remote-endpoint = <&vopb_out_edp>;
> -				};
> -				edp_in_vopl: endpoint at 1 {
> -					reg = <1>;
> -					remote-endpoint = <&vopl_out_edp>;
> -				};
> -			};
> -		};
> -	};
> -
> -	hdmi: hdmi at ff980000 {
> -		compatible = "rockchip,rk3288-dw-hdmi";
> -		reg = <0xff980000 0x20000>;
> -		reg-io-width = <4>;
> -		ddc-i2c-bus = <&i2c5>;
> +	mipi_dsi: mipi at ff960000 {
> +		compatible = "rockchip,rk3288_mipi_dsi";
> +		reg = <0xff960000 0x4000>;
> +		clocks = <&cru PCLK_MIPI_DSI0>;
> +		clock-names = "pclk_mipi";
> +		/*pinctrl-names = "default";
> +		pinctrl-0 = <&lcdc0_ctl>;*/
>   		rockchip,grf = <&grf>;
> -		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
> -		clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>;
> -		clock-names = "iahb", "isfr";
> +		#address-cells = <1>;
> +		#size-cells = <0>;
>   		status = "disabled";
>   		ports {
> -			hdmi_in: port {
> +			reg = <1>;
> +			mipi_in: port {
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> -				hdmi_in_vopb: endpoint at 0 {
> +				mipi_in_vopb: endpoint at 0 {
>   					reg = <0>;
> -					remote-endpoint = <&vopb_out_hdmi>;
> +					remote-endpoint = <&vopb_out_mipi>;
>   				};
> -				hdmi_in_vopl: endpoint at 1 {
> +				mipi_in_vopl: endpoint at 1 {
>   					reg = <1>;
> -					remote-endpoint = <&vopl_out_hdmi>;
> +					remote-endpoint = <&vopl_out_mipi>;
>   				};
>   			};
>   		};
> @@ -790,29 +765,54 @@
>   		};
>   	};
>   
> -	mipi_dsi0: mipi at ff960000 {
> -		compatible = "rockchip,rk3288_mipi_dsi";
> -		reg = <0xff960000 0x4000>;
> -		clocks = <&cru PCLK_MIPI_DSI0>;
> -		clock-names = "pclk_mipi";
> -		/*pinctrl-names = "default";
> -		pinctrl-0 = <&lcdc0_ctl>;*/
> +	edp: dp at ff970000 {
> +		compatible = "rockchip,rk3288-edp";
> +		reg = <0xff970000 0x4000>;
> +		interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
> +		clocks = <&cru SCLK_EDP>, <&cru SCLK_EDP_24M>, <&cru PCLK_EDP_CTRL>;
>   		rockchip,grf = <&grf>;
> -		#address-cells = <1>;
> -		#size-cells = <0>;
> +		clock-names = "clk_edp", "clk_edp_24m", "pclk_edp";
> +		resets = <&cru 111>;
> +		reset-names = "edp";
> +		power-domains = <&power RK3288_PD_VIO>;
>   		status = "disabled";
>   		ports {
> -			reg = <1>;
> -			mipi_in: port {
> +			edp_in: port {
>   				#address-cells = <1>;
>   				#size-cells = <0>;
> -				mipi_in_vopb: endpoint at 0 {
> +				edp_in_vopb: endpoint at 0 {
>   					reg = <0>;
> -					remote-endpoint = <&vopb_out_mipi>;
> +					remote-endpoint = <&vopb_out_edp>;
>   				};
> -				mipi_in_vopl: endpoint at 1 {
> +				edp_in_vopl: endpoint at 1 {
>   					reg = <1>;
> -					remote-endpoint = <&vopl_out_mipi>;
> +					remote-endpoint = <&vopl_out_edp>;
> +				};
> +			};
> +		};
> +	};
> +
> +	hdmi: hdmi at ff980000 {
> +		compatible = "rockchip,rk3288-dw-hdmi";
> +		reg = <0xff980000 0x20000>;
> +		reg-io-width = <4>;
> +		ddc-i2c-bus = <&i2c5>;
> +		rockchip,grf = <&grf>;
> +		interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
> +		clocks = <&cru  PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>;
> +		clock-names = "iahb", "isfr";
> +		status = "disabled";
> +		ports {
> +			hdmi_in: port {
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +				hdmi_in_vopb: endpoint at 0 {
> +					reg = <0>;
> +					remote-endpoint = <&vopb_out_hdmi>;
> +				};
> +				hdmi_in_vopl: endpoint at 1 {
> +					reg = <1>;
> +					remote-endpoint = <&vopl_out_hdmi>;
>   				};
>   			};
>   		};