arm64: dts: qcom: msm8994-angler: Fix cont_splash_mem mapping
authorPetr Vorel <pvorel@suse.cz>
Tue, 31 Jan 2023 20:04:13 +0000 (21:04 +0100)
committerBjorn Andersson <andersson@kernel.org>
Fri, 7 Apr 2023 17:21:23 +0000 (10:21 -0700)
Angler's cont_splash_mem mapping is shorter in downstream [1],
therefore 380cd3a34b7f was wrong. Obviously also 0e5ded926f2a was wrong
(workaround which fixed booting at the time).

This fixes error:
[    0.000000] memory@3401000 (0x0000000003401000--0x0000000005601000) overlaps with tzapp@4800000 (0x0000000004800000--0x0000000006100000)

[1] https://android.googlesource.com/kernel/msm/+/refs/heads/android-msm-angler-3.10-marshmallow-mr1/arch/arm64/boot/dts/huawei/huawei_msm8994_angler_row_vn1/huawei-fingerprint.dtsi#16

Fixes: 380cd3a34b7f ("arm64: dts: msm8994-angler: fix the memory map")
Fixes: 0e5ded926f2a ("arm64: dts: qcom: msm8994-angler: Disable cont_splash_mem")

Signed-off-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230131200414.24373-2-pvorel@suse.cz
arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts

index 7b0f621..59b9ed7 100644 (file)
@@ -2,7 +2,7 @@
 /*
  * Copyright (c) 2015, Huawei Inc. All rights reserved.
  * Copyright (c) 2016, The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022, Petr Vorel <petr.vorel@gmail.com>
+ * Copyright (c) 2021-2023, Petr Vorel <petr.vorel@gmail.com>
  */
 
 /dts-v1/;
                #size-cells = <2>;
                ranges;
 
+               cont_splash_mem: memory@3401000 {
+                       reg = <0 0x03401000 0 0x1000000>;
+                       no-map;
+               };
+
                tzapp_mem: tzapp@4800000 {
                        reg = <0 0x04800000 0 0x1900000>;
                        no-map;