Re: [PATCH 10/14] arm64: dts: qcom: sdm630: rename labels for DSI nodes

[Konrad Dybcio <konrad.dybcio@linaro.org>]

On 31.05.2023 03:16, Dmitry Baryshkov wrote:
> Currently in board files MDSS and DSI nodes stay apart, because labels
> for DSI nodes do not have the mdss_ prefix. It was found that grouping
> all display-related notes is more useful.
> 
> To keep all display-related nodes close in the board files, change DSI
> node labels from dsi_* to mdss_dsi_*.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  .../boot/dts/qcom/sda660-inforce-ifc6560.dts  | 16 ++++++-------
>  arch/arm64/boot/dts/qcom/sdm630.dtsi          | 20 ++++++++--------
>  arch/arm64/boot/dts/qcom/sdm660.dtsi          | 24 +++++++++----------
>  3 files changed, 30 insertions(+), 30 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
> index 7459525d9982..0b23d5bb3f26 100644
> --- a/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
> +++ b/arch/arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts
> @@ -134,7 +134,7 @@ port@0 {
>  				reg = <0>;
>  
>  				adv7533_in: endpoint {
> -					remote-endpoint = <&dsi0_out>;
> +					remote-endpoint = <&mdss_dsi0_out>;
>  				};
>  			};
>  
> @@ -183,25 +183,25 @@ bluetooth {
>  	};
>  };
>  
> -&dsi0 {
> +&mdss {
> +	status = "okay";
> +};
> +
> +&mdss_dsi0 {
>  	status = "okay";
>  	vdda-supply = <&vreg_l1a_1p225>;
>  };
>  
> -&dsi0_out {
> +&mdss_dsi0_out {
>  	remote-endpoint = <&adv7533_in>;
>  	data-lanes = <0 1 2 3>;
>  };
>  
> -&dsi0_phy {
> +&mdss_dsi0_phy {
>  	status = "okay";
>  	vcca-supply = <&vreg_l1b_0p925>;
>  };
>  
> -&mdss {
> -	status = "okay";
> -};
> -
>  &mmss_smmu {
>  	status = "okay";
>  };
> diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
> index 897f2440c9c8..bba0f366ef03 100644
> --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
> @@ -1463,8 +1463,8 @@ mmcc: clock-controller@c8c0000 {
>  					<&sleep_clk>,
>  					<&gcc GCC_MMSS_GPLL0_CLK>,
>  					<&gcc GCC_MMSS_GPLL0_DIV_CLK>,
> -					<&dsi0_phy 1>,
> -					<&dsi0_phy 0>,
> +					<&mdss_dsi0_phy 1>,
> +					<&mdss_dsi0_phy 0>,
>  					<0>,
>  					<0>,
>  					<0>,
> @@ -1536,7 +1536,7 @@ ports {
>  					port@0 {
>  						reg = <0>;
>  						mdp5_intf1_out: endpoint {
> -							remote-endpoint = <&dsi0_in>;
> +							remote-endpoint = <&mdss_dsi0_in>;
>  						};
>  					};
>  				};
> @@ -1572,7 +1572,7 @@ opp-412500000 {
>  				};
>  			};
>  
> -			dsi0: dsi@c994000 {
> +			mdss_dsi0: dsi@c994000 {
>  				compatible = "qcom,sdm660-dsi-ctrl",
>  					     "qcom,mdss-dsi-ctrl";
>  				reg = <0x0c994000 0x400>;
> @@ -1586,8 +1586,8 @@ dsi0: dsi@c994000 {
>  
>  				assigned-clocks = <&mmcc BYTE0_CLK_SRC>,
>  						  <&mmcc PCLK0_CLK_SRC>;
> -				assigned-clock-parents = <&dsi0_phy 0>,
> -							 <&dsi0_phy 1>;
> +				assigned-clock-parents = <&mdss_dsi0_phy 0>,
> +							 <&mdss_dsi0_phy 1>;
>  
>  				clocks = <&mmcc MDSS_MDP_CLK>,
>  					 <&mmcc MDSS_BYTE0_CLK>,
> @@ -1608,7 +1608,7 @@ dsi0: dsi@c994000 {
>  					      "pixel",
>  					      "core";
>  
> -				phys = <&dsi0_phy>;
> +				phys = <&mdss_dsi0_phy>;
>  
>  				status = "disabled";
>  
> @@ -1618,20 +1618,20 @@ ports {
>  
>  					port@0 {
>  						reg = <0>;
> -						dsi0_in: endpoint {
> +						mdss_dsi0_in: endpoint {
>  							remote-endpoint = <&mdp5_intf1_out>;
>  						};
>  					};
>  
>  					port@1 {
>  						reg = <1>;
> -						dsi0_out: endpoint {
> +						mdss_dsi0_out: endpoint {
>  						};
>  					};
>  				};
>  			};
>  
> -			dsi0_phy: phy@c994400 {
> +			mdss_dsi0_phy: phy@c994400 {
>  				compatible = "qcom,dsi-phy-14nm-660";
>  				reg = <0x0c994400 0x100>,
>  				      <0x0c994500 0x300>,
> diff --git a/arch/arm64/boot/dts/qcom/sdm660.dtsi b/arch/arm64/boot/dts/qcom/sdm660.dtsi
> index f0f27fc12c18..f89b27c99f40 100644
> --- a/arch/arm64/boot/dts/qcom/sdm660.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sdm660.dtsi
> @@ -148,14 +148,14 @@ ports {
>  		port@1 {
>  			reg = <1>;
>  			mdp5_intf2_out: endpoint {
> -				remote-endpoint = <&dsi1_in>;
> +				remote-endpoint = <&mdss_dsi1_in>;
>  			};
>  		};
>  	};
>  };
>  
>  &mdss {
> -	dsi1: dsi@c996000 {
> +	mdss_dsi1: dsi@c996000 {
>  		compatible = "qcom,sdm660-dsi-ctrl",
>  			     "qcom,mdss-dsi-ctrl";
>  		reg = <0x0c996000 0x400>;
> @@ -170,8 +170,8 @@ dsi1: dsi@c996000 {
>  
>  		assigned-clocks = <&mmcc BYTE1_CLK_SRC>,
>  					<&mmcc PCLK1_CLK_SRC>;
> -		assigned-clock-parents = <&dsi1_phy 0>,
> -						<&dsi1_phy 1>;
> +		assigned-clock-parents = <&mdss_dsi1_phy 0>,
> +						<&mdss_dsi1_phy 1>;
>  
>  		clocks = <&mmcc MDSS_MDP_CLK>,
>  				<&mmcc MDSS_BYTE1_CLK>,
> @@ -192,7 +192,7 @@ dsi1: dsi@c996000 {
>  					"pixel",
>  					"core";
>  
> -		phys = <&dsi1_phy>;
> +		phys = <&mdss_dsi1_phy>;
>  
>  		status = "disabled";
>  
> @@ -202,20 +202,20 @@ ports {
>  
>  			port@0 {
>  				reg = <0>;
> -				dsi1_in: endpoint {
> +				mdss_dsi1_in: endpoint {
>  					remote-endpoint = <&mdp5_intf2_out>;
>  				};
>  			};
>  
>  			port@1 {
>  				reg = <1>;
> -				dsi1_out: endpoint {
> +				mdss_dsi1_out: endpoint {
>  				};
>  			};
>  		};
>  	};
>  
> -	dsi1_phy: phy@c996400 {
> +	mdss_dsi1_phy: phy@c996400 {
>  		compatible = "qcom,dsi-phy-14nm-660";
>  		reg = <0x0c996400 0x100>,
>  				<0x0c996500 0x300>,
> @@ -239,10 +239,10 @@ &mmcc {
>  			<&sleep_clk>,
>  			<&gcc GCC_MMSS_GPLL0_CLK>,
>  			<&gcc GCC_MMSS_GPLL0_DIV_CLK>,
> -			<&dsi0_phy 1>,
> -			<&dsi0_phy 0>,
> -			<&dsi1_phy 1>,
> -			<&dsi1_phy 0>,
> +			<&mdss_dsi0_phy 1>,
> +			<&mdss_dsi0_phy 0>,
> +			<&mdss_dsi1_phy 1>,
> +			<&mdss_dsi1_phy 0>,
>  			<0>,
>  			<0>;
>  };