Re: [PATCH 2/2] arm64: dts: qcom: msm8996: rename labels for HDMI nodes

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

 



On 15.06.2023 10:34, Dmitry Baryshkov wrote:
> In board files MDSS and HDMI nodes do not come next to each other,
> because labels for HDMI nodes do not have the common mdss_ prefix.
> 
> Follow the DSI example and enable such grouping by changing the prefix
> for HDMI labels to mdss_hdmi_*.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>

Konrad
>  arch/arm64/boot/dts/qcom/apq8096-db820c.dts  | 40 ++++++++++----------
>  arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts |  6 +--
>  arch/arm64/boot/dts/qcom/msm8996-mtp.dts     |  4 +-
>  arch/arm64/boot/dts/qcom/msm8996.dtsi        | 12 +++---
>  4 files changed, 31 insertions(+), 31 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> index b599909c4463..39170c18c693 100644
> --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> @@ -208,25 +208,6 @@ &gpu {
>  	status = "okay";
>  };
>  
> -&hdmi {
> -	status = "okay";
> -
> -	pinctrl-names = "default", "sleep";
> -	pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>;
> -	pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>;
> -
> -	core-vdda-supply = <&vreg_l12a_1p8>;
> -	core-vcc-supply = <&vreg_s4a_1p8>;
> -};
> -
> -&hdmi_phy {
> -	status = "okay";
> -
> -	vddio-supply = <&vreg_l12a_1p8>;
> -	vcca-supply = <&vreg_l28a_0p925>;
> -	#phy-cells = <0>;
> -};
> -
>  &hsusb_phy1 {
>  	status = "okay";
>  
> @@ -251,6 +232,25 @@ &mdss {
>  	status = "okay";
>  };
>  
> +&mdss_hdmi {
> +	status = "okay";
> +
> +	pinctrl-names = "default", "sleep";
> +	pinctrl-0 = <&hdmi_hpd_active &hdmi_ddc_active>;
> +	pinctrl-1 = <&hdmi_hpd_suspend &hdmi_ddc_suspend>;
> +
> +	core-vdda-supply = <&vreg_l12a_1p8>;
> +	core-vcc-supply = <&vreg_s4a_1p8>;
> +};
> +
> +&mdss_hdmi_phy {
> +	status = "okay";
> +
> +	vddio-supply = <&vreg_l12a_1p8>;
> +	vcca-supply = <&vreg_l28a_0p925>;
> +	#phy-cells = <0>;
> +};
> +
>  &mmcc {
>  	vdd-gfx-supply = <&vdd_gfx>;
>  };
> @@ -1054,7 +1054,7 @@ platform {
>  		};
>  
>  		codec {
> -			sound-dai = <&hdmi 0>;
> +			sound-dai = <&mdss_hdmi 0>;
>  		};
>  	};
>  
> diff --git a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
> index ed2e2f6c6775..ac6471d1db1f 100644
> --- a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
> +++ b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
> @@ -92,15 +92,15 @@ &gpu {
>  	status = "okay";
>  };
>  
> -&hdmi {
> +&mdss {
>  	status = "okay";
>  };
>  
> -&hdmi_phy {
> +&mdss_hdmi {
>  	status = "okay";
>  };
>  
> -&mdss {
> +&mdss_hdmi_phy {
>  	status = "okay";
>  };
>  
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-mtp.dts b/arch/arm64/boot/dts/qcom/msm8996-mtp.dts
> index 596ad4c896f5..495d45a16e63 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996-mtp.dts
> +++ b/arch/arm64/boot/dts/qcom/msm8996-mtp.dts
> @@ -24,10 +24,10 @@ &blsp2_uart2 {
>  	status = "okay";
>  };
>  
> -&hdmi {
> +&mdss_hdmi {
>  	status = "okay";
>  };
>  
> -&hdmi_phy {
> +&mdss_hdmi_phy {
>  	status = "okay";
>  };
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index 3855366ca89f..40ac0a784a4a 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -895,7 +895,7 @@ mmcc: clock-controller@8c0000 {
>  				 <&mdss_dsi0_phy 0>,
>  				 <&mdss_dsi1_phy 1>,
>  				 <&mdss_dsi1_phy 0>,
> -				 <&hdmi_phy>;
> +				 <&mdss_hdmi_phy>;
>  			clock-names = "xo",
>  				      "gpll0",
>  				      "gcc_mmss_noc_cfg_ahb_clk",
> @@ -980,7 +980,7 @@ ports {
>  					port@0 {
>  						reg = <0>;
>  						mdp5_intf3_out: endpoint {
> -							remote-endpoint = <&hdmi_in>;
> +							remote-endpoint = <&mdss_hdmi_in>;
>  						};
>  					};
>  
> @@ -1136,7 +1136,7 @@ mdss_dsi1_phy: phy@996400 {
>  				status = "disabled";
>  			};
>  
> -			hdmi: hdmi-tx@9a0000 {
> +			mdss_hdmi: hdmi-tx@9a0000 {
>  				compatible = "qcom,hdmi-tx-8996";
>  				reg =	<0x009a0000 0x50c>,
>  					<0x00070000 0x6158>,
> @@ -1160,7 +1160,7 @@ hdmi: hdmi-tx@9a0000 {
>  					"alt_iface",
>  					"extp";
>  
> -				phys = <&hdmi_phy>;
> +				phys = <&mdss_hdmi_phy>;
>  				#sound-dai-cells = <1>;
>  
>  				status = "disabled";
> @@ -1171,14 +1171,14 @@ ports {
>  
>  					port@0 {
>  						reg = <0>;
> -						hdmi_in: endpoint {
> +						mdss_hdmi_in: endpoint {
>  							remote-endpoint = <&mdp5_intf3_out>;
>  						};
>  					};
>  				};
>  			};
>  
> -			hdmi_phy: phy@9a0600 {
> +			mdss_hdmi_phy: phy@9a0600 {
>  				#phy-cells = <0>;
>  				compatible = "qcom,hdmi-phy-8996";
>  				reg = <0x009a0600 0x1c4>,



[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