Skip to content

Commit

Permalink
arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem mapping
Browse files Browse the repository at this point in the history
[ Upstream commit 3cb6a27 ]

cont_splash_mem has different memory mapping than generic from msm8994.dtsi:

[    0.000000] cma: Found cont_splash_mem@0, memory base 0x0000000003400000, size 12 MiB, limit 0xffffffffffffffff
[    0.000000] cma: CMA: reserved 12 MiB at 0x0000000003400000 for cont_splash_mem

This fixes boot.

Fixes: 976d321 ("arm64: dts: qcom: msm8992: Make the DT an overlay on top of 8994")
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Link: https://lore.kernel.org/r/20210713185734.380-3-petr.vorel@gmail.com
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
pevik authored and Sasha Levin committed Aug 26, 2021
1 parent aa9cac6 commit 02491c3
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
Expand Up @@ -10,6 +10,9 @@
#include "pm8994.dtsi"
#include "pmi8994.dtsi"

/* cont_splash_mem has different memory mapping */
/delete-node/ &cont_splash_mem;

/ {
model = "LG Nexus 5X";
compatible = "lg,bullhead", "qcom,msm8992";
Expand Down Expand Up @@ -42,6 +45,11 @@
ftrace-size = <0x10000>;
pmsg-size = <0x20000>;
};

cont_splash_mem: memory@3400000 {
reg = <0 0x03400000 0 0x1200000>;
no-map;
};
};
};

Expand Down

0 comments on commit 02491c3

Please sign in to comment.