Re: [PATCH 06/14] arm64: dts: qcom: msm8996: rename labels for DSI nodes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




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@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>

Konrad
>  .../boot/dts/qcom/msm8996-oneplus-common.dtsi | 30 ++++++++--------
>  .../boot/dts/qcom/msm8996-xiaomi-common.dtsi  | 22 ++++++------
>  .../boot/dts/qcom/msm8996-xiaomi-gemini.dts   | 18 +++++-----
>  arch/arm64/boot/dts/qcom/msm8996.dtsi         | 36 +++++++++----------
>  .../dts/qcom/msm8996pro-xiaomi-natrium.dts    | 18 +++++-----
>  5 files changed, 62 insertions(+), 62 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
> index 2adadc1e5b7c..ec5457508fe6 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi
> @@ -164,21 +164,6 @@ &camss {
>  	vdda-supply = <&vreg_l2a_1p25>;
>  };
>  
> -&dsi0 {
> -	vdda-supply = <&vreg_l2a_1p25>;
> -	vcca-supply = <&vreg_l22a_3p0>;
> -	status = "okay";
> -};
> -
> -&dsi0_out {
> -	data-lanes = <0 1 2 3>;
> -};
> -
> -&dsi0_phy {
> -	vcca-supply = <&vreg_l28a_0p925>;
> -	status = "okay";
> -};
> -
>  &hsusb_phy1 {
>  	vdd-supply = <&vreg_l28a_0p925>;
>  	vdda-pll-supply = <&vreg_l12a_1p8>;
> @@ -201,6 +186,21 @@ &mdss {
>  	status = "okay";
>  };
>  
> +&mdss_dsi0 {
> +	vdda-supply = <&vreg_l2a_1p25>;
> +	vcca-supply = <&vreg_l22a_3p0>;
> +	status = "okay";
> +};
> +
> +&mdss_dsi0_out {
> +	data-lanes = <0 1 2 3>;
> +};
> +
> +&mdss_dsi0_phy {
> +	vcca-supply = <&vreg_l28a_0p925>;
> +	status = "okay";
> +};
> +
>  &mmcc {
>  	vdd-gfx-supply = <&vdd_gfx>;
>  };
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
> index 1ce5df0a3405..47f55c7311e9 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi
> @@ -235,7 +235,15 @@ bluetooth: bluetooth {
>  	};
>  };
>  
> -&dsi0 {
> +&gpu {
> +	status = "okay";
> +};
> +
> +&mdss {
> +	status = "okay";
> +};
> +
> +&mdss_dsi0 {
>  	status = "okay";
>  
>  	vdd-supply = <&vreg_l2a_1p25>;
> @@ -246,26 +254,18 @@ &dsi0 {
>  	pinctrl-1 = <&mdss_dsi_sleep &mdss_te_sleep>;
>  };
>  
> -&dsi0_out {
> +&mdss_dsi0_out {
>  	status = "okay";
>  
>  	data-lanes = <0 1 2 3>;
>  };
>  
> -&dsi0_phy {
> +&mdss_dsi0_phy {
>  	status = "okay";
>  
>  	vcca-supply = <&vreg_l28a_0p925>;
>  };
>  
> -&gpu {
> -	status = "okay";
> -};
> -
> -&mdss {
> -	status = "okay";
> -};
> -
>  &mmcc {
>  	vdd-gfx-supply = <&vdd_gfx>;
>  };
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> index 100123d51494..bdedcf9dff03 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
> @@ -93,7 +93,13 @@ synaptics@20 {
>  
>  };
>  
> -&dsi0 {
> +&gpu {
> +	zap-shader {
> +		firmware-name = "qcom/msm8996/gemini/a530_zap.mbn";
> +	};
> +};
> +
> +&mdss_dsi0 {
>  	status = "okay";
>  
>  	vdd-supply = <&vreg_l2a_1p25>;
> @@ -112,22 +118,16 @@ panel: panel@0 {
>  
>  		port {
>  			panel_in: endpoint {
> -				remote-endpoint = <&dsi0_out>;
> +				remote-endpoint = <&mdss_dsi0_out>;
>  			};
>  		};
>  	};
>  };
>  
> -&dsi0_out {
> +&mdss_dsi0_out {
>  	remote-endpoint = <&panel_in>;
>  };
>  
> -&gpu {
> -	zap-shader {
> -		firmware-name = "qcom/msm8996/gemini/a530_zap.mbn";
> -	};
> -};
> -
>  &pmi8994_wled {
>  	status = "okay";
>  };
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index f75932cc2a30..3855366ca89f 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -891,10 +891,10 @@ mmcc: clock-controller@8c0000 {
>  			clocks = <&xo_board>,
>  				 <&gcc GPLL0>,
>  				 <&gcc GCC_MMSS_NOC_CFG_AHB_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>,
>  				 <&hdmi_phy>;
>  			clock-names = "xo",
>  				      "gpll0",
> @@ -987,20 +987,20 @@ mdp5_intf3_out: endpoint {
>  					port@1 {
>  						reg = <1>;
>  						mdp5_intf1_out: endpoint {
> -							remote-endpoint = <&dsi0_in>;
> +							remote-endpoint = <&mdss_dsi0_in>;
>  						};
>  					};
>  
>  					port@2 {
>  						reg = <2>;
>  						mdp5_intf2_out: endpoint {
> -							remote-endpoint = <&dsi1_in>;
> +							remote-endpoint = <&mdss_dsi1_in>;
>  						};
>  					};
>  				};
>  			};
>  
> -			dsi0: dsi@994000 {
> +			mdss_dsi0: dsi@994000 {
>  				compatible = "qcom,msm8996-dsi-ctrl",
>  					     "qcom,mdss-dsi-ctrl";
>  				reg = <0x00994000 0x400>;
> @@ -1024,9 +1024,9 @@ dsi0: dsi@994000 {
>  					      "pixel",
>  					      "core";
>  				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>;
>  
> -				phys = <&dsi0_phy>;
> +				phys = <&mdss_dsi0_phy>;
>  				status = "disabled";
>  
>  				#address-cells = <1>;
> @@ -1038,20 +1038,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@994400 {
> +			mdss_dsi0_phy: phy@994400 {
>  				compatible = "qcom,dsi-phy-14nm";
>  				reg = <0x00994400 0x100>,
>  				      <0x00994500 0x300>,
> @@ -1068,7 +1068,7 @@ dsi0_phy: phy@994400 {
>  				status = "disabled";
>  			};
>  
> -			dsi1: dsi@996000 {
> +			mdss_dsi1: dsi@996000 {
>  				compatible = "qcom,msm8996-dsi-ctrl",
>  					     "qcom,mdss-dsi-ctrl";
>  				reg = <0x00996000 0x400>;
> @@ -1092,9 +1092,9 @@ dsi1: dsi@996000 {
>  					      "pixel",
>  					      "core";
>  				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>;
>  
> -				phys = <&dsi1_phy>;
> +				phys = <&mdss_dsi1_phy>;
>  				status = "disabled";
>  
>  				#address-cells = <1>;
> @@ -1106,20 +1106,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@996400 {
> +			mdss_dsi1_phy: phy@996400 {
>  				compatible = "qcom,dsi-phy-14nm";
>  				reg = <0x00996400 0x100>,
>  				      <0x00996500 0x300>,
> diff --git a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
> index d18d0b0eda95..7957c8823f0d 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
> @@ -39,7 +39,13 @@ touchscreen@20 {
>  	};
>  };
>  
> -&dsi0 {
> +&gpu {
> +	zap-shader {
> +		firmware-name = "qcom/msm8996/natrium/a530_zap.mbn";
> +	};
> +};
> +
> +&mdss_dsi0 {
>  	status = "okay";
>  
>  	vdda-supply = <&vreg_l2a_1p25>;
> @@ -57,22 +63,16 @@ panel: panel@0 {
>  
>  		port {
>  			panel_in: endpoint {
> -				remote-endpoint = <&dsi0_out>;
> +				remote-endpoint = <&mdss_dsi0_out>;
>  			};
>  		};
>  	};
>  };
>  
> -&dsi0_out {
> +&mdss_dsi0_out {
>  	remote-endpoint = <&panel_in>;
>  };
>  
> -&gpu {
> -	zap-shader {
> -		firmware-name = "qcom/msm8996/natrium/a530_zap.mbn";
> -	};
> -};
> -
>  &mss_pil {
>  	firmware-name = "qcom/msm8996/natrium/mba.mbn",
>  			"qcom/msm8996/natrium/modem.mbn";



[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]


  Powered by Linux