ARM: dts: qcom: apq8064 merge hw splinlock into corresponding syscon device

[ Upstream commit 325c6a441ae1f8fcb1db9bb945b8bdbd3142141e ]

Follow up the expected way of describing the SFPB hwspinlock and merge
hwspinlock node into corresponding syscon node, fixing several dt-schema
warnings.

Fixes: 24a9baf933dc ("ARM: dts: qcom: apq8064: Add hwmutex and SMEM nodes")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250318-fix-nexus-4-v2-7-bcedd1406790@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 3f1002c34446cfc733601e404b66133fb60aee6e..ba6cc81684c865e8375fa2261bc346e928512bf1 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -211,12 +211,6 @@
                };
        };
 
-       sfpb_mutex: hwmutex {
-               compatible = "qcom,sfpb-mutex";
-               syscon = <&sfpb_wrapper_mutex 0x604 0x4>;
-               #hwlock-cells = <1>;
-       };
-
        smem {
                compatible = "qcom,smem";
                memory-region = <&smem_region>;
@@ -360,9 +354,10 @@
                        pinctrl-0 = <&ps_hold>;
                };
 
-               sfpb_wrapper_mutex: syscon@1200000 {
-                       compatible = "syscon";
-                       reg = <0x01200000 0x8000>;
+               sfpb_mutex: hwmutex@1200600 {
+                       compatible = "qcom,sfpb-mutex";
+                       reg = <0x01200600 0x100>;
+                       #hwlock-cells = <1>;
                };
 
                intc: interrupt-controller@2000000 {