| Message ID | 20230720072048.10093-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | bf80e606ca8db08c840d1ad394ec75eaabba717b |
| Headers | show |
| Series | [RESEND,1/2] arm64: dts: qcom: msm8994: fix duplicated @6c00000 reserved memory | expand |
On Thu, 20 Jul 2023 09:20:47 +0200, Krzysztof Kozlowski wrote: > Reserved memory @6c00000 is defined in MSM8994 DTSI and few boards: > > Warning (unique_unit_address_if_enabled): /reserved-memory/reserved@6c00000: duplicate unit-address (also used in node /reserved-memory/hole2@6c00000) > Warning (unique_unit_address_if_enabled): /reserved-memory/reserved@6c00000: duplicate unit-address (also used in node /reserved-memory/memory@6c00000) > > Applied, thanks! [1/2] arm64: dts: qcom: msm8994: fix duplicated @6c00000 reserved memory commit: bf80e606ca8db08c840d1ad394ec75eaabba717b [2/2] arm64: dts: qcom: msm8992-libra: drop duplicated reserved memory commit: f32096602c19e68fb9bf04b494d13f1190602554 Best regards,
diff --git a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts index fcca1ba94da6..501e05efbef4 100644 --- a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts +++ b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts @@ -15,6 +15,7 @@ /delete-node/ &audio_mem; /delete-node/ &mpss_mem; /delete-node/ &peripheral_region; +/delete-node/ &res_hyp_mem; /delete-node/ &rmtfs_mem; / { diff --git a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi index 2861bcdf87b7..cbc84459a5ae 100644 --- a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi @@ -23,6 +23,7 @@ /delete-node/ &mba_mem; /delete-node/ &mpss_mem; /delete-node/ &peripheral_region; +/delete-node/ &res_hyp_mem; /delete-node/ &rmtfs_mem; /delete-node/ &smem_mem; diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi index c374fba5d8f9..4324bd2bfe76 100644 --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi @@ -281,7 +281,7 @@ adsp_mem: memory@c9400000 { no-map; }; - reserved@6c00000 { + res_hyp_mem: reserved@6c00000 { reg = <0 0x06c00000 0 0x400000>; no-map; };
Reserved memory @6c00000 is defined in MSM8994 DTSI and few boards: Warning (unique_unit_address_if_enabled): /reserved-memory/reserved@6c00000: duplicate unit-address (also used in node /reserved-memory/hole2@6c00000) Warning (unique_unit_address_if_enabled): /reserved-memory/reserved@6c00000: duplicate unit-address (also used in node /reserved-memory/memory@6c00000) Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 1 + arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 1 + arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-)