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
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From a6cc7a18ed349af3a38b1f5cf307d5808e1420e3 Mon Sep 17 00:00:00 2001
|
|
From: Konrad Dybcio <konrad.dybcio@linaro.org>
|
|
Date: Mon, 19 Dec 2022 14:19:17 +0100
|
|
Subject: [PATCH 4/4] arm64: dts: qcom: msm8992: Don't use sfpb mutex
|
|
|
|
MSM8992 uses the same mutex hardware as MSM8994. This was wrong
|
|
from the start, but never presented as an issue until the sfpb
|
|
compatible was given different driver data.
|
|
|
|
Fixes: 6a6d1978f9c0 ("arm64: dts: msm8992 SoC and LG Bullhead (Nexus 5X) support")
|
|
Reported-by: Eugene Lepshy <fekz115@gmail.com>
|
|
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
|
|
|
|
Link: https://lore.kernel.org/linux-arm-msm/20221219131918.446587-1-konrad.dybcio@linaro.org/
|
|
Signed-off-by: Petr Vorel <pvorel@suse.cz>
|
|
---
|
|
arch/arm64/boot/dts/qcom/msm8992.dtsi | 4 ----
|
|
1 file changed, 4 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi
|
|
index 750643763a76..f4be09fc1b15 100644
|
|
--- a/arch/arm64/boot/dts/qcom/msm8992.dtsi
|
|
+++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi
|
|
@@ -36,10 +36,6 @@ &rpmcc {
|
|
compatible = "qcom,rpmcc-msm8992", "qcom,rpmcc";
|
|
};
|
|
|
|
-&tcsr_mutex {
|
|
- compatible = "qcom,sfpb-mutex";
|
|
-};
|
|
-
|
|
&timer {
|
|
interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
|
|
<GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
|
|
--
|
|
2.39.0
|
|
|