On 15.06.2023 10:34, Dmitry Baryshkov wrote:
> The commit f43b6dc7d56e ("arm64: dts: qcom: msm8996: rename labels for
> HDMI nodes") is broken, it changes all the HDMI node names,
> compatible strings instead of changing just node aliases. Revert the
> commit in order to land a proper clean version.
>
> Reported-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
> Fixes: f43b6dc7d56e ("arm64: dts: qcom: msm8996: rename labels for HDMI nodes")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 50 ++++++++++----------
> 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 | 16 +++----
> 4 files changed, 38 insertions(+), 38 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> index 537547b97459..b599909c4463 100644
> --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
> @@ -208,6 +208,25 @@ &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";
>
> @@ -232,25 +251,6 @@ &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>;
> };
>
> - mdss_hdmi_hpd_active: mdss_hdmi-hpd-active-state {
> + hdmi_hpd_active: hdmi-hpd-active-state {
> pins = "gpio34";
> function = "hdmi_hot";
> bias-pull-down;
> drive-strength = <16>;
> };
>
> - mdss_hdmi_hpd_suspend: mdss_hdmi-hpd-suspend-state {
> + hdmi_hpd_suspend: hdmi-hpd-suspend-state {
> pins = "gpio34";
> function = "hdmi_hot";
> bias-pull-down;
> drive-strength = <2>;
> };
>
> - mdss_hdmi_ddc_active: mdss_hdmi-ddc-active-state {
> + hdmi_ddc_active: hdmi-ddc-active-state {
> pins = "gpio32", "gpio33";
> function = "hdmi_ddc";
> drive-strength = <2>;
> bias-pull-up;
> };
>
> - mdss_hdmi_ddc_suspend: mdss_hdmi-ddc-suspend-state {
> + hdmi_ddc_suspend: hdmi-ddc-suspend-state {
> pins = "gpio32", "gpio33";
> function = "hdmi_ddc";
> drive-strength = <2>;
> @@ -1043,7 +1043,7 @@ cpu {
> };
> };
>
> - mdss_hdmi-dai-link {
> + hdmi-dai-link {
> link-name = "HDMI";
> cpu {
> sound-dai = <&q6afedai HDMI_RX>;
> @@ -1054,7 +1054,7 @@ platform {
> };
>
> codec {
> - sound-dai = <&mdss_hdmi 0>;
> + sound-dai = <&hdmi 0>;
> };
> };
>
> diff --git a/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts b/arch/arm64/boot/dts/qcom/apq8096-ifc6640.dts
> index ac6471d1db1f..ed2e2f6c6775 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";
> };
>
> -&mdss {
> +&hdmi {
> status = "okay";
> };
>
> -&mdss_hdmi {
> +&hdmi_phy {
> status = "okay";
> };
>
> -&mdss_hdmi_phy {
> +&mdss {
> status = "okay";
> };
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8996-mtp.dts b/arch/arm64/boot/dts/qcom/msm8996-mtp.dts
> index 495d45a16e63..596ad4c896f5 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";
> };
>
> -&mdss_hdmi {
> +&hdmi {
> status = "okay";
> };
>
> -&mdss_hdmi_phy {
> +&hdmi_phy {
> status = "okay";
> };
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index 0cb2d4f08c3a..3855366ca89f 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>,
> - <&mdss_hdmi_phy>;
> + <&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 = <&mdss_hdmi_in>;
> + remote-endpoint = <&hdmi_in>;
> };
> };
>
> @@ -1136,8 +1136,8 @@ mdss_dsi1_phy: phy@996400 {
> status = "disabled";
> };
>
> - mdss_hdmi: mdss_hdmi-tx@9a0000 {
> - compatible = "qcom,mdss_hdmi-tx-8996";
> + hdmi: hdmi-tx@9a0000 {
> + compatible = "qcom,hdmi-tx-8996";
> reg = <0x009a0000 0x50c>,
> <0x00070000 0x6158>,
> <0x009e0000 0xfff>;
> @@ -1160,7 +1160,7 @@ mdss_hdmi: mdss_hdmi-tx@9a0000 {
> "alt_iface",
> "extp";
>
> - phys = <&mdss_hdmi_phy>;
> + phys = <&hdmi_phy>;
> #sound-dai-cells = <1>;
>
> status = "disabled";
> @@ -1171,16 +1171,16 @@ ports {
>
> port@0 {
> reg = <0>;
> - mdss_hdmi_in: endpoint {
> + hdmi_in: endpoint {
> remote-endpoint = <&mdp5_intf3_out>;
> };
> };
> };
> };
>
> - mdss_hdmi_phy: phy@9a0600 {
> + hdmi_phy: phy@9a0600 {
> #phy-cells = <0>;
> - compatible = "qcom,mdss_hdmi-phy-8996";
> + compatible = "qcom,hdmi-phy-8996";
> reg = <0x009a0600 0x1c4>,
> <0x009a0a00 0x124>,
> <0x009a0c00 0x124>,
