Skip to content

Commit 0e5ded9

Browse files
pevikandersson
authored andcommitted
arm64: dts: qcom: msm8994-angler: Disable cont_splash_mem
As the default definition breaks booting angler: [ 1.862561] printk: console [ttyMSM0] enabled [ 1.872260] msm_serial: driver initialized D - 15524 - pm_driver_init, Delta cont_splash_mem was introduced in 74d6d0a, but the problem manifested after commit '86588296acbf ("fdt: Properly handle "no-map" field in the memory region")'. Disabling it because Angler's firmware does not report where the memory is allocated (dmesg from downstream kernel): [ 0.000000] cma: Found cont_splash_mem@0, memory base 0x0000000000000000, size 16 MiB, limit 0x0000000000000000 [ 0.000000] cma: CMA: reserved 16 MiB at 0x0000000000000000 for cont_splash_mem Similar issue might be on Google Nexus 5X (lg-bullhead). Other MSM8992/4 are known to report correct address. Fixes: 74d6d0a ("arm64: dts: qcom: msm8994/8994-kitakami: Fix up the memory map") Suggested-by: Konrad Dybcio <[email protected]> Signed-off-by: Petr Vorel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Andersson <[email protected]>
1 parent 4cbb02f commit 0e5ded9

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
/* Copyright (c) 2015, Huawei Inc. All rights reserved.
33
* Copyright (c) 2016, The Linux Foundation. All rights reserved.
4+
* Copyright (c) 2021, Petr Vorel <[email protected]>
45
*/
56

67
/dts-v1/;
78

89
#include "msm8994.dtsi"
910

11+
/* Angler's firmware does not report where the memory is allocated */
12+
/delete-node/ &cont_splash_mem;
13+
1014
/ {
1115
model = "Huawei Nexus 6P";
1216
compatible = "huawei,angler", "qcom,msm8994";

0 commit comments

Comments
 (0)