ARM: dts: qcom: msm8974: rename labels for DSI 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 DSI
node aliases from dsi_* to mdss_dsi_*.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230531011623.3808538-15-dmitry.baryshkov@linaro.org

diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
index d021cf7..e067943 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
+++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts
@@ -71,7 +71,15 @@
        };
 };
 
-&dsi0 {
+&gpu {
+       status = "okay";
+};
+
+&mdss {
+       status = "okay";
+};
+
+&mdss_dsi0 {
        vdda-supply = <&pm8941_l2>;
        vdd-supply = <&pm8941_l22>;
        vddio-supply = <&pm8941_l12>;
@@ -88,18 +96,18 @@
 
                port {
                        panel_in: endpoint {
-                               remote-endpoint = <&dsi0_out>;
+                               remote-endpoint = <&mdss_dsi0_out>;
                        };
                };
        };
 };
 
-&dsi0_out {
+&mdss_dsi0_out {
        remote-endpoint = <&panel_in>;
        data-lanes = <0 1 2 3>;
 };
 
-&dsi0_phy {
+&mdss_dsi0_phy {
        status = "okay";
 
        vddio-supply = <&pm8941_l12>;

diff --git a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
index fea8a6b..e2a7ab7 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts
@@ -230,7 +230,11 @@
        };
 };
 
-&dsi0 {
+&mdss {
+       status = "okay";
+};
+
+&mdss_dsi0 {
        status = "okay";
 
        vdda-supply = <&pm8941_l2>;
@@ -246,27 +250,23 @@
 
                port {
                        panel_in: endpoint {
-                               remote-endpoint = <&dsi0_out>;
+                               remote-endpoint = <&mdss_dsi0_out>;
                        };
                };
        };
 };
 
-&dsi0_out {
+&mdss_dsi0_out {
        remote-endpoint = <&panel_in>;
        data-lanes = <0 1 2 3>;
 };
 
-&dsi0_phy {
+&mdss_dsi0_phy {
        status = "okay";
 
        vddio-supply = <&pm8941_l12>;
 };
 
-&mdss {
-       status = "okay";
-};
-
 &pm8941_gpios {
        gpio_keys_pin_a: gpio-keys-active-state {
                pins = "gpio2", "gpio3";

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 7dcbe08..21fae1f 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -1836,10 +1836,10 @@
                                 <&gcc GPLL0_VOTE>,
                                 <&gcc GPLL1_VOTE>,
                                 <&rpmcc RPM_SMD_GFX3D_CLK_SRC>,
-                                <&dsi0_phy 1>,
-                                <&dsi0_phy 0>,
-                                <&dsi1_phy 1>,
-                                <&dsi1_phy 0>,
+                                <&mdss_dsi0_phy 1>,
+                                <&mdss_dsi0_phy 0>,
+                                <&mdss_dsi1_phy 1>,
+                                <&mdss_dsi1_phy 0>,
                                 <0>,
                                 <0>,
                                 <0>;
@@ -1904,20 +1904,20 @@
                                        port@0 {
                                                reg = <0>;
                                                mdp5_intf1_out: endpoint {
-                                                       remote-endpoint = <&dsi0_in>;
+                                                       remote-endpoint = <&mdss_dsi0_in>;
                                                };
                                        };
 
                                        port@1 {
                                                reg = <1>;
                                                mdp5_intf2_out: endpoint {
-                                                       remote-endpoint = <&dsi1_in>;
+                                                       remote-endpoint = <&mdss_dsi1_in>;
                                                };
                                        };
                                };
                        };
 
-                       dsi0: dsi@fd922800 {
+                       mdss_dsi0: dsi@fd922800 {
                                compatible = "qcom,msm8974-dsi-ctrl",
                                             "qcom,mdss-dsi-ctrl";
                                reg = <0xfd922800 0x1f8>;
@@ -1927,7 +1927,7 @@
                                interrupts = <4>;
 
                                assigned-clocks = <&mmcc BYTE0_CLK_SRC>, <&mmcc PCLK0_CLK_SRC>;
-                               assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
+                               assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
 
                                clocks = <&mmcc MDSS_MDP_CLK>,
                                         <&mmcc MDSS_AHB_CLK>,
@@ -1944,7 +1944,7 @@
                                              "core",
                                              "core_mmss";
 
-                               phys = <&dsi0_phy>;
+                               phys = <&mdss_dsi0_phy>;
 
                                status = "disabled";
 
@@ -1957,20 +1957,20 @@
 
                                        port@0 {
                                                reg = <0>;
-                                               dsi0_in: endpoint {
+                                               mdss_dsi0_in: endpoint {
                                                        remote-endpoint = <&mdp5_intf1_out>;
                                                };
                                        };
 
                                        port@1 {
                                                reg = <1>;
-                                               dsi0_out: endpoint {
+                                               mdss_dsi0_out: endpoint {
                                                };
                                        };
                                };
                        };
 
-                       dsi0_phy: phy@fd922a00 {
+                       mdss_dsi0_phy: phy@fd922a00 {
                                compatible = "qcom,dsi-phy-28nm-hpm";
                                reg = <0xfd922a00 0xd4>,
                                      <0xfd922b00 0x280>,
@@ -1988,7 +1988,7 @@
                                status = "disabled";
                        };
 
-                       dsi1: dsi@fd922e00 {
+                       mdss_dsi1: dsi@fd922e00 {
                                compatible = "qcom,msm8974-dsi-ctrl",
                                             "qcom,mdss-dsi-ctrl";
                                reg = <0xfd922e00 0x1f8>;
@@ -1998,7 +1998,7 @@
                                interrupts = <4>;
 
                                assigned-clocks = <&mmcc BYTE1_CLK_SRC>, <&mmcc PCLK1_CLK_SRC>;
-                               assigned-clock-parents = <&dsi1_phy 0>, <&dsi1_phy 1>;
+                               assigned-clock-parents = <&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 1>;
 
                                clocks = <&mmcc MDSS_MDP_CLK>,
                                         <&mmcc MDSS_AHB_CLK>,
@@ -2015,7 +2015,7 @@
                                              "core",
                                              "core_mmss";
 
-                               phys = <&dsi1_phy>;
+                               phys = <&mdss_dsi1_phy>;
 
                                status = "disabled";
 
@@ -2028,20 +2028,20 @@
 
                                        port@0 {
                                                reg = <0>;
-                                               dsi1_in: endpoint {
+                                               mdss_dsi1_in: endpoint {
                                                        remote-endpoint = <&mdp5_intf2_out>;
                                                };
                                        };
 
                                        port@1 {
                                                reg = <1>;
-                                               dsi1_out: endpoint {
+                                               mdss_dsi1_out: endpoint {
                                                };
                                        };
                                };
                        };
 
-                       dsi1_phy: phy@fd923000 {
+                       mdss_dsi1_phy: phy@fd923000 {
                                compatible = "qcom,dsi-phy-28nm-hpm";
                                reg = <0xfd923000 0xd4>,
                                      <0xfd923100 0x280>,

diff --git a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
index b9698ff..cfbcd52 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
+++ b/arch/arm/boot/dts/qcom-msm8974pro-samsung-klte.dts
@@ -329,7 +329,15 @@
        };
 };
 
-&dsi0 {
+&gpu {
+       status = "okay";
+};
+
+&mdss {
+       status = "okay";
+};
+
+&mdss_dsi0 {
        status = "okay";
 
        vdda-supply = <&pma8084_l2>;
@@ -351,31 +359,23 @@
 
                port {
                        panel_in: endpoint {
-                               remote-endpoint = <&dsi0_out>;
+                               remote-endpoint = <&mdss_dsi0_out>;
                        };
                };
        };
 };
 
-&dsi0_out {
+&mdss_dsi0_out {
        remote-endpoint = <&panel_in>;
        data-lanes = <0 1 2 3>;
 };
 
-&dsi0_phy {
+&mdss_dsi0_phy {
        status = "okay";
 
        vddio-supply = <&pma8084_l12>;
 };
 
-&gpu {
-       status = "okay";
-};
-
-&mdss {
-       status = "okay";
-};
-
 &pma8084_gpios {
        gpio_keys_pin_a: gpio-keys-active-state {
                pins = "gpio2", "gpio3", "gpio5";