arm64: dts: qcom: msm8992-libra: drop duplicated reserved memory
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Thu, 20 Jul 2023 07:20:48 +0000 (09:20 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:52:02 +0000 (11:52 +0100)
[ Upstream commit f32096602c19e68fb9bf04b494d13f1190602554 ]

There are two entries for similar reserved memory: qseecom@cb400000 and
audio@cb400000.  Keep the qseecom as it is longer.

  Warning (unique_unit_address_if_enabled): /reserved-memory/audio@cb400000: duplicate unit-address (also used in node /reserved-memory/qseecom@cb400000)

Fixes: 69876bc6fd4d ("arm64: dts: qcom: msm8992-libra: Fix the memory map")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230720072048.10093-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts

index 3ab0ad1..95eab1f 100644 (file)
                        qcom,client-id = <1>;
                };
 
-               audio_mem: audio@cb400000 {
-                       reg = <0 0xcb000000 0 0x400000>;
-                       no-mem;
-               };
-
                qseecom_mem: qseecom@cb400000 {
                        reg = <0 0xcb400000 0 0x1c00000>;
                        no-mem;