Merge tag 'soc-dt-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / qcom / sdm630.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi
index eaead2f7beb4ea93a3e2c498c4455fc13fd0558c..bba0f366ef03bf72084b2d6779c2d91fd05a1572 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm630.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi
@@ -550,7 +550,7 @@
                };
        };
 
-       soc {
+       soc@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0 0 0 0xffffffff>;
@@ -1463,8 +1463,8 @@
                                        <&sleep_clk>,
                                        <&gcc GCC_MMSS_GPLL0_CLK>,
                                        <&gcc GCC_MMSS_GPLL0_DIV_CLK>,
-                                       <&dsi0_phy 1>,
-                                       <&dsi0_phy 0>,
+                                       <&mdss_dsi0_phy 1>,
+                                       <&mdss_dsi0_phy 0>,
                                        <0>,
                                        <0>,
                                        <0>,
@@ -1536,7 +1536,7 @@
                                        port@0 {
                                                reg = <0>;
                                                mdp5_intf1_out: endpoint {
-                                                       remote-endpoint = <&dsi0_in>;
+                                                       remote-endpoint = <&mdss_dsi0_in>;
                                                };
                                        };
                                };
@@ -1572,7 +1572,7 @@
                                };
                        };
 
-                       dsi0: dsi@c994000 {
+                       mdss_dsi0: dsi@c994000 {
                                compatible = "qcom,sdm660-dsi-ctrl",
                                             "qcom,mdss-dsi-ctrl";
                                reg = <0x0c994000 0x400>;
@@ -1586,8 +1586,8 @@
 
                                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_BYTE0_CLK>,
@@ -1608,7 +1608,7 @@
                                              "pixel",
                                              "core";
 
-                               phys = <&dsi0_phy>;
+                               phys = <&mdss_dsi0_phy>;
 
                                status = "disabled";
 
@@ -1618,20 +1618,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@c994400 {
+                       mdss_dsi0_phy: phy@c994400 {
                                compatible = "qcom,dsi-phy-14nm-660";
                                reg = <0x0c994400 0x100>,
                                      <0x0c994500 0x300>,
@@ -1894,7 +1894,7 @@
                        };
                };
 
-               camss: camss@ca00000 {
+               camss: camss@ca00020 {
                        compatible = "qcom,sdm660-camss";
                        reg = <0x0ca00020 0x10>,
                              <0x0ca30000 0x100>,