MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2026-01-27 12:35:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230615083422.350297-3-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
This commit is contained in:
Dmitry Baryshkov 2023-06-15 11:34:22 +03:00 committed by Bjorn Andersson
parent 2b812caf5f
commit 1770394e68
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
arch/arm64/boot/dts/qcom/apq8096-db820c.dts
View File

@ -208,25 +208,6 @@
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 @@
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 @@
};
codec {
sound-dai = <&hdmi 0>;
sound-dai = <&mdss_hdmi 0>;
};
};

16
arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
View File

@ -92,18 +92,18 @@
status = "okay";
};
&hdmi {
status = "okay";
};
&hdmi_phy {
status = "okay";
};
&mdss {
status = "okay";
};
&mdss_hdmi {
status = "okay";
};
&mdss_hdmi_phy {
status = "okay";
};
&sdc2_state_on {
cd-pins {
pins = "gpio38";

4
arch/arm64/boot/dts/qcom/msm8996-mtp.dts
View File

@ -24,10 +24,10 @@
status = "okay";
};
&hdmi {
&mdss_hdmi {
status = "okay";
};
&hdmi_phy {
&mdss_hdmi_phy {
status = "okay";
};

12
arch/arm64/boot/dts/qcom/msm8996.dtsi
View File

@ -895,7 +895,7 @@
<&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 @@
port@0 {
reg = <0>;
mdp5_intf3_out: endpoint {
remote-endpoint = <&hdmi_in>;
remote-endpoint = <&mdss_hdmi_in>;
};
};
@ -1136,7 +1136,7 @@
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 @@
"alt_iface",
"extp";
phys = <&hdmi_phy>;
phys = <&mdss_hdmi_phy>;
#sound-dai-cells = <1>;
status = "disabled";
@ -1171,14 +1171,14 @@
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>,