arm64: dts: qcom: msm8916: Drop standalone smem node

SMEM can now be described directly in the reserved-memory.
This is mainly meant for newer SoCs where there is only one SMEM
region. However, even on older SoCs like MSM8916 there is clearly one
main SMEM region (described by "memory-region") that holds the
smem_header and one special extra region used only for data of the
RPM ("qcom,rpm-msg-ram").

The definition in reserved-memory also looks cleaner for older SoCs,
so make use of that in MSM8916 as well.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20211018110009.30837-2-stephan@gerhold.net

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index b798a91514e74725bd03206285b2e8d1c9eeeddc..c1c42f26b61e0f5e6ca98f98ea74b7b6a3af4886 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -41,9 +41,13 @@
                        no-map;
                };
 
-               smem_mem: smem@86300000 {
+               smem@86300000 {
+                       compatible = "qcom,smem";
                        reg = <0x0 0x86300000 0x0 0x100000>;
                        no-map;
+
+                       hwlocks = <&tcsr_mutex 3>;
+                       qcom,rpm-msg-ram = <&rpm_msg_ram>;
                };
 
                hypervisor@86400000 {
@@ -331,15 +335,6 @@
                };
        };
 
-       smem {
-               compatible = "qcom,smem";
-
-               memory-region = <&smem_mem>;
-               qcom,rpm-msg-ram = <&rpm_msg_ram>;
-
-               hwlocks = <&tcsr_mutex 3>;
-       };
-
        smp2p-hexagon {
                compatible = "qcom,smp2p";
                qcom,smem = <435>, <428>;