port@1 {
                                                reg = <1>;
                                                dpu_intf1_out: endpoint {
-                                                       remote-endpoint = <&dsi0_in>;
+                                                       remote-endpoint = <&mdss_dsi0_in>;
                                                };
                                        };
 
                                        port@2 {
                                                reg = <2>;
                                                dpu_intf2_out: endpoint {
-                                                       remote-endpoint = <&dsi1_in>;
+                                                       remote-endpoint = <&mdss_dsi1_in>;
                                                };
                                        };
 
                                };
                        };
 
-                       dsi0: dsi@ae94000 {
+                       mdss_dsi0: dsi@ae94000 {
                                compatible = "qcom,mdss-dsi-ctrl";
                                reg = <0 0x0ae94000 0 0x400>;
                                reg-names = "dsi_ctrl";
                                operating-points-v2 = <&dsi_opp_table>;
                                power-domains = <&rpmhpd SC8180X_MMCX>;
 
-                               phys = <&dsi0_phy>;
+                               phys = <&mdss_dsi0_phy>;
                                phy-names = "dsi";
 
                                status = "disabled";
 
                                        port@0 {
                                                reg = <0>;
-                                               dsi0_in: endpoint {
+                                               mdss_dsi0_in: endpoint {
                                                        remote-endpoint = <&dpu_intf1_out>;
                                                };
                                        };
 
                                        port@1 {
                                                reg = <1>;
-                                               dsi0_out: endpoint {
+                                               mdss_dsi0_out: endpoint {
                                                };
                                        };
                                };
                                };
                        };
 
-                       dsi0_phy: dsi-phy@ae94400 {
+                       mdss_dsi0_phy: dsi-phy@ae94400 {
                                compatible = "qcom,dsi-phy-7nm";
                                reg = <0 0x0ae94400 0 0x200>,
                                      <0 0x0ae94600 0 0x280>,
                                status = "disabled";
                        };
 
-                       dsi1: dsi@ae96000 {
+                       mdss_dsi1: dsi@ae96000 {
                                compatible = "qcom,mdss-dsi-ctrl";
                                reg = <0 0x0ae96000 0 0x400>;
                                reg-names = "dsi_ctrl";
                                operating-points-v2 = <&dsi_opp_table>;
                                power-domains = <&rpmhpd SC8180X_MMCX>;
 
-                               phys = <&dsi1_phy>;
+                               phys = <&mdss_dsi1_phy>;
                                phy-names = "dsi";
 
                                status = "disabled";
 
                                        port@0 {
                                                reg = <0>;
-                                               dsi1_in: endpoint {
+                                               mdss_dsi1_in: endpoint {
                                                        remote-endpoint = <&dpu_intf2_out>;
                                                };
                                        };
 
                                        port@1 {
                                                reg = <1>;
-                                               dsi1_out: endpoint {
+                                               mdss_dsi1_out: endpoint {
                                                };
                                        };
                                };
                        };
 
-                       dsi1_phy: dsi-phy@ae96400 {
+                       mdss_dsi1_phy: dsi-phy@ae96400 {
                                compatible = "qcom,dsi-phy-7nm";
                                reg = <0 0x0ae96400 0 0x200>,
                                      <0 0x0ae96600 0 0x280>,