Skip to content

Commit

Permalink
arm64: dts: qcom: msm8992-bullhead: Disable dfps_data_mem
Browse files Browse the repository at this point in the history
[ Upstream commit 4dee5aa ]

It's disabled on downstream [1] thus not shown on downstream dmesg.

Removing it fixes warnings on v6.1:

[    0.000000] OF: reserved mem: OVERLAP DETECTED!
[    0.000000] dfps_data_mem@3400000 (0x0000000003400000--0x0000000003401000) overlaps with memory@3400000 (0x0000000003400000--0x0000000004600000)

[1] https://android.googlesource.com/kernel/msm.git/+/android-7.0.0_r0.17/arch/arm64/boot/dts/lge/msm8992-bullhead.dtsi#137

Fixes: 976d321 ("arm64: dts: qcom: msm8992: Make the DT an overlay on top of 8994")

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221226185440.440968-3-pevik@seznam.cz
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
pevik authored and gregkh committed Mar 10, 2023
1 parent 91475aa commit d98ab7b
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
Expand Up @@ -14,6 +14,9 @@
/* cont_splash_mem has different memory mapping */
/delete-node/ &cont_splash_mem;

/* disabled on downstream, conflicts with cont_splash_mem */
/delete-node/ &dfps_data_mem;

/ {
model = "LG Nexus 5X";
compatible = "lg,bullhead", "qcom,msm8992";
Expand Down

0 comments on commit d98ab7b

Please sign in to comment.