diff options
| author | Petr Vorel <pvorel@suse.cz> | 2023-01-31 21:04:14 +0100 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2023-04-07 10:21:27 -0700 |
| commit | c85c8a992794dfcd7cea7a41871710c27c5592a6 (patch) | |
| tree | 3893bf151ac3c8610748c69a4f36e3117d65dd61 /arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts | |
| parent | fe88480a6be92ecbf6f205ff3a7d7e5ded0562dd (diff) | |
arm64: dts: qcom: msm8994-angler: removed clash with smem_region
This fixes memory overlap error:
[ 0.000000] reserved@6300000 (0x0000000006300000--0x0000000007000000) overlaps with smem_region@6a00000 (0x0000000006a00000--0x0000000006c00000)
smem_region is the same as in downstream (qcom,smem) [1], therefore
split reserved memory into two sections on either side of smem_region.
Not adding labels as it's not expected to be used.
[1] https://android.googlesource.com/kernel/msm/+/refs/heads/android-msm-angler-3.10-marshmallow-mr1/arch/arm/boot/dts/qcom/msm8994.dtsi#948
Fixes: 380cd3a34b7f ("arm64: dts: msm8994-angler: fix the memory map")
Signed-off-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230131200414.24373-3-pvorel@suse.cz
Diffstat (limited to 'arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts | 4 |
1 files changed, 2 insertions, 2 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 59b9ed78cf0c..29e79ae0849d 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 @@ -41,8 +41,8 @@ no-map; }; - removed_region: reserved@6300000 { - reg = <0 0x06300000 0 0xD00000>; + reserved@6300000 { + reg = <0 0x06300000 0 0x700000>; no-map; }; }; |