arm64: dts: ipq6018: drop standalone 'smem' node

Since commit b5af64fceb04 ("soc: qcom: smem: Support reserved-memory
description") the SMEM device can be instantiated directly from a
reserved-memory node.

The 'smem' node is defined in this way for each modern IPQ SoCs except for
IPQ6018. In order to make it inline with the others, move the 'compatible'
and the 'hwlock' properties into the respective reserved-memory node, and
drop the standalone 'smem' node.

Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
Reviewed-by: Kathiravan Thirumoorthy <kathiravan.thirumoorthy@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250506-ipq6018-drop-smem-v1-1-af99d177be2f@gmail.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
index a02aa641cb9081a1b62b387d961c5adcf37cb3ba..7f0faf26b7079596e0f8451cc3d05a76d231c2b9 100644 (file)
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -210,8 +210,11 @@
                };
 
                smem_region: memory@4aa00000 {
+                       compatible = "qcom,smem";
                        reg = <0x0 0x4aa00000 0x0 0x100000>;
                        no-map;
+
+                       hwlocks = <&tcsr_mutex 3>;
                };
 
                q6_region: memory@4ab00000 {
@@ -220,12 +223,6 @@
                };
        };
 
-       smem {
-               compatible = "qcom,smem";
-               memory-region = <&smem_region>;
-               hwlocks = <&tcsr_mutex 3>;
-       };
-
        soc: soc@0 {
                #address-cells = <2>;
                #size-cells = <2>;