ca20cbcaf4
New features: * msm8994-huawei-angler: Add sdhc1 definition (internal SD card). Backporting 3 patches: * 0001-arm64-dts-msm8992-bullhead-add-memory-hole-region.patch fixes bullhead boot since 6.0-rc1, already in qcom tree * 0002-arm64-dts-qcom-msm8992-bullhead-Fix-cont_splash_mem-.patch memory fix, likely to be merged * 0003-arm64-dts-qcom-msm8992-bullhead-Disable-dfps_data_me.patch memory fix, likely to be merged * 0004-arm64-dts-qcom-msm8992-Don-t-use-sfpb-mutex.patch memory fix, likely to be merged * 0005-arm64-dts-msm8994-angler-fix-the-memory-map.patch fixes angler reset during starting services in rootfs, likely to be merged Remove all backported commits from newer versions. While at it, remove various CONFIG_NET_VENDOR_.* and CONFIG_MSM_.* and CONFIG_.*_QCOM_.* for other SOCs. Signed-off-by: Petr Vorel <petr.vorel@gmail.com> [ci:skip-build]: already built successfully in CI
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From ffa4a69f5fd6ca803b208d819432b5dcf6f14cf8 Mon Sep 17 00:00:00 2001
|
|
From: Petr Vorel <petr.vorel@gmail.com>
|
|
Date: Mon, 26 Dec 2022 19:54:39 +0100
|
|
Subject: [PATCH 3/3] arm64: dts: qcom: msm8992-bullhead: Disable dfps_data_mem
|
|
|
|
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: 976d321f32dc ("arm64: dts: qcom: msm8992: Make the DT an overlay on top of 8994")
|
|
|
|
Link: https://lore.kernel.org/linux-arm-msm/20221226185440.440968-3-pevik@seznam.cz/
|
|
|
|
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
|
|
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
|
Signed-off-by: Petr Vorel <pvorel@suse.cz>
|
|
---
|
|
arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
|
|
index 97f109cf8240..49f30efdbe65 100644
|
|
--- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
|
|
+++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
|
|
@@ -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";
|
|
--
|
|
2.39.0
|
|
|