arm64: dts: qcom: msm8996: Fix HDMI node

Message ID 20230615-topic-8996hdmi-v1-1-39584bfd68d2@linaro.org
State New
Headers
Series arm64: dts: qcom: msm8996: Fix HDMI node |

Commit Message

Konrad Dybcio June 15, 2023, 8:12 a.m. UTC
  A recent commit messed up the node name and compatibles. Fix it.

Fixes: f43b6dc7d56e ("arm64: dts: qcom: msm8996: rename labels for HDMI nodes")
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
 arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


---
base-commit: 925294c9aa184801cc0a451b69a18dd0fe7d847d
change-id: 20230615-topic-8996hdmi-520fb03bd36c

Best regards,
  

Comments

Dmitry Baryshkov June 15, 2023, 8:19 a.m. UTC | #1
On Thu, 15 Jun 2023 at 11:12, Konrad Dybcio <konrad.dybcio@linaro.org> wrote:
>
> A recent commit messed up the node name and compatibles. Fix it.
>
> Fixes: f43b6dc7d56e ("arm64: dts: qcom: msm8996: rename labels for HDMI nodes")
> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

I should use regexps more carefully.
  
Dmitry Baryshkov June 15, 2023, 8:21 a.m. UTC | #2
On Thu, 15 Jun 2023 at 11:19, Dmitry Baryshkov
<dmitry.baryshkov@linaro.org> wrote:
>
> On Thu, 15 Jun 2023 at 11:12, Konrad Dybcio <konrad.dybcio@linaro.org> wrote:
> >
> > A recent commit messed up the node name and compatibles. Fix it.
> >
> > Fixes: f43b6dc7d56e ("arm64: dts: qcom: msm8996: rename labels for HDMI nodes")
> > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
>
> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>
> I should use regexps more carefully.

On the other side, it looks like it is so broken that it might be
better to land a revert & proper commit.

>
>
> --
> With best wishes
> Dmitry
  
Stephan Gerhold June 15, 2023, 8:22 a.m. UTC | #3
On Thu, Jun 15, 2023 at 10:12:32AM +0200, Konrad Dybcio wrote:
> A recent commit messed up the node name and compatibles. Fix it.
> 
> Fixes: f43b6dc7d56e ("arm64: dts: qcom: msm8996: rename labels for HDMI nodes")

Looks like that commit did a simple search & replace without checking
the result :')

Can you also fix the weird pinctrl node names in apq8096-db820c?
(mdss_hdmi -> mdss-hdmi, or maybe even rename it back to just hdmi-
since that part doesn't really need grouping...)

The "hdmi-dai-link" was also changed to "mdss_hdmi-dai-link".

Thanks,
Stephan

> Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
> ---
>  arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index 0cb2d4f08c3a..40ac0a784a4a 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -1136,8 +1136,8 @@ mdss_dsi1_phy: phy@996400 {
>  				status = "disabled";
>  			};
>  
> -			mdss_hdmi: mdss_hdmi-tx@9a0000 {
> -				compatible = "qcom,mdss_hdmi-tx-8996";
> +			mdss_hdmi: hdmi-tx@9a0000 {
> +				compatible = "qcom,hdmi-tx-8996";
>  				reg =	<0x009a0000 0x50c>,
>  					<0x00070000 0x6158>,
>  					<0x009e0000 0xfff>;
> @@ -1180,7 +1180,7 @@ mdss_hdmi_in: endpoint {
>  
>  			mdss_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>,
> 
> ---
> base-commit: 925294c9aa184801cc0a451b69a18dd0fe7d847d
> change-id: 20230615-topic-8996hdmi-520fb03bd36c
> 
> Best regards,
> -- 
> Konrad Dybcio <konrad.dybcio@linaro.org>
>
  

Patch

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 0cb2d4f08c3a..40ac0a784a4a 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -1136,8 +1136,8 @@  mdss_dsi1_phy: phy@996400 {
 				status = "disabled";
 			};
 
-			mdss_hdmi: mdss_hdmi-tx@9a0000 {
-				compatible = "qcom,mdss_hdmi-tx-8996";
+			mdss_hdmi: hdmi-tx@9a0000 {
+				compatible = "qcom,hdmi-tx-8996";
 				reg =	<0x009a0000 0x50c>,
 					<0x00070000 0x6158>,
 					<0x009e0000 0xfff>;
@@ -1180,7 +1180,7 @@  mdss_hdmi_in: endpoint {
 
 			mdss_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>,