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

[platform/kernel/linux-rpi.git] / arch / arm64 / boot / dts / qcom / sdm845.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index cdeb05e..02a6ea0 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -3899,6 +3899,7 @@
                qspi: spi@88df000 {
                        compatible = "qcom,sdm845-qspi", "qcom,qspi-v1";
                        reg = <0 0x088df000 0 0x600>;
+                       iommus = <&apps_smmu 0x160 0x0>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
@@ -4238,7 +4239,7 @@
                        #reset-cells = <1>;
                };
 
-               camss: camss@a00000 {
+               camss: camss@acb3000 {
                        compatible = "qcom,sdm845-camss";
 
                        reg = <0 0x0acb3000 0 0x1000>,
@@ -4509,14 +4510,14 @@
                                        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>;
                                                };
                                        };
                                };
@@ -4616,7 +4617,7 @@
                                };
                        };
 
-                       dsi0: dsi@ae94000 {
+                       mdss_dsi0: dsi@ae94000 {
                                compatible = "qcom,sdm845-dsi-ctrl",
                                             "qcom,mdss-dsi-ctrl";
                                reg = <0 0x0ae94000 0 0x400>;
@@ -4638,12 +4639,12 @@
                                              "iface",
                                              "bus";
                                assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>;
-                               assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
+                               assigned-clock-parents = <&mdss_dsi0_phy 0>, <&mdss_dsi0_phy 1>;
 
                                operating-points-v2 = <&dsi_opp_table>;
                                power-domains = <&rpmhpd SDM845_CX>;
 
-                               phys = <&dsi0_phy>;
+                               phys = <&mdss_dsi0_phy>;
 
                                status = "disabled";
 
@@ -4656,20 +4657,20 @@
 
                                        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: phy@ae94400 {
+                       mdss_dsi0_phy: phy@ae94400 {
                                compatible = "qcom,dsi-phy-10nm";
                                reg = <0 0x0ae94400 0 0x200>,
                                      <0 0x0ae94600 0 0x280>,
@@ -4688,7 +4689,7 @@
                                status = "disabled";
                        };
 
-                       dsi1: dsi@ae96000 {
+                       mdss_dsi1: dsi@ae96000 {
                                compatible = "qcom,sdm845-dsi-ctrl",
                                             "qcom,mdss-dsi-ctrl";
                                reg = <0 0x0ae96000 0 0x400>;
@@ -4710,12 +4711,12 @@
                                              "iface",
                                              "bus";
                                assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE1_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK1_CLK_SRC>;
-                               assigned-clock-parents = <&dsi1_phy 0>, <&dsi1_phy 1>;
+                               assigned-clock-parents = <&mdss_dsi1_phy 0>, <&mdss_dsi1_phy 1>;
 
                                operating-points-v2 = <&dsi_opp_table>;
                                power-domains = <&rpmhpd SDM845_CX>;
 
-                               phys = <&dsi1_phy>;
+                               phys = <&mdss_dsi1_phy>;
 
                                status = "disabled";
 
@@ -4728,20 +4729,20 @@
 
                                        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: phy@ae96400 {
+                       mdss_dsi1_phy: phy@ae96400 {
                                compatible = "qcom,dsi-phy-10nm";
                                reg = <0 0x0ae96400 0 0x200>,
                                      <0 0x0ae96600 0 0x280>,
@@ -4903,10 +4904,10 @@
                        clocks = <&rpmhcc RPMH_CXO_CLK>,
                                 <&gcc GCC_DISP_GPLL0_CLK_SRC>,
                                 <&gcc GCC_DISP_GPLL0_DIV_CLK_SRC>,
-                                <&dsi0_phy 0>,
-                                <&dsi0_phy 1>,
-                                <&dsi1_phy 0>,
-                                <&dsi1_phy 1>,
+                                <&mdss_dsi0_phy 0>,
+                                <&mdss_dsi0_phy 1>,
+                                <&mdss_dsi1_phy 0>,
+                                <&mdss_dsi1_phy 1>,
                                 <&dp_phy 0>,
                                 <&dp_phy 1>;
                        clock-names = "bi_tcxo",
@@ -5137,6 +5138,7 @@
                                          <SLEEP_TCS   3>,
                                          <WAKE_TCS    3>,
                                          <CONTROL_TCS 1>;
+                       power-domains = <&CLUSTER_PD>;
 
                        apps_bcm_voter: bcm-voter {
                                compatible = "qcom,bcm-voter";
@@ -5221,7 +5223,7 @@
                };
 
                slimbam: dma-controller@17184000 {
-                       compatible = "qcom,bam-v1.7.0";
+                       compatible = "qcom,bam-v1.7.4", "qcom,bam-v1.7.0";
                        qcom,controlled-remotely;
                        reg = <0 0x17184000 0 0x2a000>;
                        num-channels = <31>;