Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[linux-2.6-microblaze.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 0a86fe7..6d7172e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -128,28 +128,23 @@
                        no-map;
                };
 
-               ipa_fw_mem: memory@8c400000 {
-                       reg = <0 0x8c400000 0 0x10000>;
+               wlan_msa_mem: memory@8c400000 {
+                       reg = <0 0x8c400000 0 0x100000>;
                        no-map;
                };
 
-               ipa_gsi_mem: memory@8c410000 {
-                       reg = <0 0x8c410000 0 0x5000>;
+               gpu_mem: memory@8c515000 {
+                       reg = <0 0x8c515000 0 0x2000>;
                        no-map;
                };
 
-               gpu_mem: memory@8c415000 {
-                       reg = <0 0x8c415000 0 0x2000>;
+               ipa_fw_mem: memory@8c517000 {
+                       reg = <0 0x8c517000 0 0x5a000>;
                        no-map;
                };
 
-               adsp_mem: memory@8c500000 {
-                       reg = <0 0x8c500000 0 0x1a00000>;
-                       no-map;
-               };
-
-               wlan_msa_mem: memory@8df00000 {
-                       reg = <0 0x8df00000 0 0x100000>;
+               adsp_mem: memory@8c600000 {
+                       reg = <0 0x8c600000 0 0x1a00000>;
                        no-map;
                };
 
@@ -4148,9 +4143,8 @@
                        power-domains = <&dispcc MDSS_GDSC>;
 
                        clocks = <&gcc GCC_DISP_AHB_CLK>,
-                                <&gcc GCC_DISP_AXI_CLK>,
                                 <&dispcc DISP_CC_MDSS_MDP_CLK>;
-                       clock-names = "iface", "bus", "core";
+                       clock-names = "iface", "core";
 
                        assigned-clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>;
                        assigned-clock-rates = <300000000>;
@@ -4178,11 +4172,12 @@
                                      <0 0x0aeb0000 0 0x2008>;
                                reg-names = "mdp", "vbif";
 
-                               clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
+                               clocks = <&gcc GCC_DISP_AXI_CLK>,
+                                        <&dispcc DISP_CC_MDSS_AHB_CLK>,
                                         <&dispcc DISP_CC_MDSS_AXI_CLK>,
                                         <&dispcc DISP_CC_MDSS_MDP_CLK>,
                                         <&dispcc DISP_CC_MDSS_VSYNC_CLK>;
-                               clock-names = "iface", "bus", "core", "vsync";
+                               clock-names = "gcc-bus", "iface", "bus", "core", "vsync";
 
                                assigned-clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>,
                                                  <&dispcc DISP_CC_MDSS_VSYNC_CLK>;
@@ -4260,6 +4255,9 @@
                                              "core",
                                              "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>;
+
                                operating-points-v2 = <&dsi_opp_table>;
                                power-domains = <&rpmhpd SDM845_CX>;
 
@@ -4326,6 +4324,9 @@
                                              "core",
                                              "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>;
+
                                operating-points-v2 = <&dsi_opp_table>;
                                power-domains = <&rpmhpd SDM845_CX>;