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

Now that the SMEM binding and driver allows the SMEM node to be
described in the reserved-memory region directly, move the compatible
and hwlock properties to the reserved-memory node and drop the
standadlone node.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
Link: https://lore.kernel.org/r/20210930182111.57353-5-bjorn.andersson@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index 35736b3..b00ff38 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -99,9 +99,11 @@
                        no-map;
                };
 
-               smem_mem: memory@86000000 {
+               smem@86000000 {
+                       compatible = "qcom,smem";
                        reg = <0x0 0x86000000 0 0x200000>;
                        no-map;
+                       hwlocks = <&tcsr_mutex 3>;
                };
 
                tz_mem: memory@86200000 {
@@ -940,12 +942,6 @@
                #hwlock-cells = <1>;
        };
 
-       smem {
-               compatible = "qcom,smem";
-               memory-region = <&smem_mem>;
-               hwlocks = <&tcsr_mutex 3>;
-       };
-
        smp2p-cdsp {
                compatible = "qcom,smp2p";
                qcom,smem = <94>, <432>;