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
59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
From b1ebf79b9cf764bb735be0d801e44ac797855670 Mon Sep 17 00:00:00 2001
|
|
From: Dominik Kobinski <dominikkobinski314@gmail.com>
|
|
Date: Fri, 30 Dec 2022 20:48:45 +0100
|
|
Subject: [PATCH 5/5] arm64: dts: msm8994-angler: fix the memory map
|
|
|
|
Add reserved regions for memory hole and tz app mem to prevent
|
|
rebooting. Also enable cont_splash_mem, it is the same as the
|
|
generic 8994 one.
|
|
|
|
Link: https://lore.kernel.org/linux-arm-msm/20221230194845.57780-1-dominikkobinski314@gmail.com/
|
|
|
|
Reported-by: Petr Vorel <petr.vorel@gmail.com>
|
|
Reviewed-by: Petr Vorel <petr.vorel@gmail.com>
|
|
Signed-off-by: Dominik Kobinski <dominikkobinski314@gmail.com>
|
|
Signed-off-by: Petr Vorel <pvorel@suse.cz>
|
|
---
|
|
.../qcom/msm8994-huawei-angler-rev-101.dts | 19 ++++++++++++++++---
|
|
1 file changed, 16 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
|
|
index dbfbb77e9ff5..7e2c0dcc11ab 100644
|
|
--- a/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
|
|
+++ b/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
|
|
@@ -8,9 +8,6 @@
|
|
|
|
#include "msm8994.dtsi"
|
|
|
|
-/* Angler's firmware does not report where the memory is allocated */
|
|
-/delete-node/ &cont_splash_mem;
|
|
-
|
|
/ {
|
|
model = "Huawei Nexus 6P";
|
|
compatible = "huawei,angler", "qcom,msm8994";
|
|
@@ -27,6 +24,22 @@ aliases {
|
|
chosen {
|
|
stdout-path = "serial0:115200n8";
|
|
};
|
|
+
|
|
+ reserved-memory {
|
|
+ #address-cells = <2>;
|
|
+ #size-cells = <2>;
|
|
+ ranges;
|
|
+
|
|
+ tzapp_mem: tzapp@4800000 {
|
|
+ reg = <0 0x04800000 0 0x1900000>;
|
|
+ no-map;
|
|
+ };
|
|
+
|
|
+ removed_region: reserved@6300000 {
|
|
+ reg = <0 0x06300000 0 0xD00000>;
|
|
+ no-map;
|
|
+ };
|
|
+ };
|
|
};
|
|
|
|
&blsp1_uart2 {
|
|
--
|
|
2.39.0
|
|
|