Commit f43b6dc7 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: msm8996: rename labels for HDMI nodes 



Currently in board files MDSS and HDMI nodes stay apart, because labels
for HDMI 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 HDMI
node labels from hdmi_* to mdss_hdmi_*.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230531011623.3808538-14-dmitry.baryshkov@linaro.org
parent e47a7f57

arch/arm64/boot/dts/qcom/apq8096-db820c.dts

+25 −25
Original line number Diff line number Diff line
@@ -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 = <&mdss_hdmi_hpd_active &mdss_hdmi_ddc_active>;

	pinctrl-1 = <&mdss_hdmi_hpd_suspend &mdss_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>;

};
@@ -433,28 +433,28 @@ sdc2_cd_off: sdc2-cd-off-state { 
		drive-strength = <2>;

	};



	hdmi_hpd_active: hdmi-hpd-active-state {

	mdss_hdmi_hpd_active: mdss_hdmi-hpd-active-state {

		pins = "gpio34";

		function = "hdmi_hot";

		bias-pull-down;

		drive-strength = <16>;

	};



	hdmi_hpd_suspend: hdmi-hpd-suspend-state {

	mdss_hdmi_hpd_suspend: mdss_hdmi-hpd-suspend-state {

		pins = "gpio34";

		function = "hdmi_hot";

		bias-pull-down;

		drive-strength = <2>;

	};



	hdmi_ddc_active: hdmi-ddc-active-state {

	mdss_hdmi_ddc_active: mdss_hdmi-ddc-active-state {

		pins = "gpio32", "gpio33";

		function = "hdmi_ddc";

		drive-strength = <2>;

		bias-pull-up;

	};



	hdmi_ddc_suspend: hdmi-ddc-suspend-state {

	mdss_hdmi_ddc_suspend: mdss_hdmi-ddc-suspend-state {

		pins = "gpio32", "gpio33";

		function = "hdmi_ddc";

		drive-strength = <2>;
@@ -1043,7 +1043,7 @@ cpu { 
		};

	};



	hdmi-dai-link {

	mdss_hdmi-dai-link {

		link-name = "HDMI";

		cpu {

			sound-dai = <&q6afedai HDMI_RX>;
@@ -1054,7 +1054,7 @@ platform { 
		};



		codec {

			sound-dai = <&hdmi 0>;

			sound-dai = <&mdss_hdmi 0>;

		};

	};

arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts

+3 −3
Original line number Diff line number Diff line
@@ -92,15 +92,15 @@ &gpu { 
	status = "okay";

};



&hdmi {

&mdss {

	status = "okay";

};



&hdmi_phy {

&mdss_hdmi {

	status = "okay";

};



&mdss {

&mdss_hdmi_phy {

	status = "okay";

};

arch/arm64/boot/dts/qcom/msm8996-mtp.dts

+2 −2
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ &blsp2_uart2 { 
	status = "okay";

};



&hdmi {

&mdss_hdmi {

	status = "okay";

};



&hdmi_phy {

&mdss_hdmi_phy {

	status = "okay";

};

arch/arm64/boot/dts/qcom/msm8996.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -893,7 +893,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",
@@ -978,7 +978,7 @@ ports { 
					port@0 {

						reg = <0>;

						mdp5_intf3_out: endpoint {

							remote-endpoint = <&hdmi_in>;

							remote-endpoint = <&mdss_hdmi_in>;

						};

					};
@@ -1134,8 +1134,8 @@ mdss_dsi1_phy: phy@996400 { 
				status = "disabled";

			};



			hdmi: hdmi-tx@9a0000 {

				compatible = "qcom,hdmi-tx-8996";

			mdss_hdmi: mdss_hdmi-tx@9a0000 {

				compatible = "qcom,mdss_hdmi-tx-8996";

				reg =	<0x009a0000 0x50c>,

					<0x00070000 0x6158>,

					<0x009e0000 0xfff>;
@@ -1158,7 +1158,7 @@ hdmi: hdmi-tx@9a0000 { 
					"alt_iface",

					"extp";



				phys = <&hdmi_phy>;

				phys = <&mdss_hdmi_phy>;

				#sound-dai-cells = <1>;



				status = "disabled";
@@ -1169,16 +1169,16 @@ 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";

				compatible = "qcom,mdss_hdmi-phy-8996";

				reg = <0x009a0600 0x1c4>,

				      <0x009a0a00 0x124>,

				      <0x009a0c00 0x124>,